watr 4.6.6 → 4.6.8

package/dist/watr.js

@@ -56,6 +56,17 @@ var str = (s) => {
   return bytes;
 };
 var unescape = (s) => tdec.decode(new Uint8Array(str(s)));
+var clone = (node) => Array.isArray(node) ? node.map(clone) : node;
+var walk = (node, fn, parent, idx) => {
+  fn(node, parent, idx);
+  if (Array.isArray(node)) for (let i = 0; i < node.length; i++) walk(node[i], fn, node, i);
+};
+var walkPost = (node, fn, parent, idx) => {
+  if (Array.isArray(node)) for (let i = 0; i < node.length; i++) walkPost(node[i], fn, node, i);
+  const result = fn(node, parent, idx);
+  if (result !== void 0 && parent) parent[idx] = result;
+  return result !== void 0 ? result : node;
+};
 
 // src/encode.js
 var uleb = (n, buffer = []) => {
@@ -141,7 +152,7 @@ var _i64 = new BigInt64Array(_buf);
 i64.parse = (n) => {
   n = cleanInt(n);
   const neg = n[0] === "-";
-  const body = neg ? n.slice(1) : n;
+  const body = neg || n[0] === "+" ? n.slice(1) : n;
   let max;
   if (body[0] === "0" && (body[1] === "x" || body[1] === "X")) {
     const hex = body.slice(2).replace(/^0+/, "") || "0";
@@ -1243,6 +1254,17 @@ var INSTR = [
     "i64.atomic.rmw32.cmpxchg_u memarg"
   ]
 ];
+var resultType = (op) => {
+  if (typeof op !== "string") return null;
+  const dot = op.indexOf(".");
+  if (dot < 0) return null;
+  const prefix = op.slice(0, dot);
+  const scalar = prefix === "i32" || prefix === "i64" || prefix === "f32" || prefix === "f64";
+  if (scalar && /^(eqz?|ne|[lg][te])(_[su])?$/.test(op.slice(dot + 1))) return "i32";
+  if (scalar || prefix === "v128") return prefix;
+  if (op === "memory.size" || op === "memory.grow") return "i32";
+  return null;
+};
 var SECTION = { custom: 0, type: 1, import: 2, func: 3, table: 4, memory: 5, tag: 13, strings: 14, global: 6, export: 7, start: 8, elem: 9, datacount: 12, code: 10, data: 11 };
 var TYPE = {
   // Value types
@@ -2177,91 +2199,6 @@ function print(tree, options = {}) {
 }
 
 // src/polyfill.js
-var FEATURES = {
-  funcref: ["ref.func", "call_ref", "return_call_ref"],
-  sign_ext: ["i32.extend8_s", "i32.extend16_s", "i64.extend8_s", "i64.extend16_s", "i64.extend32_s"],
-  nontrapping: [
-    "i32.trunc_sat_f32_s",
-    "i32.trunc_sat_f32_u",
-    "i32.trunc_sat_f64_s",
-    "i32.trunc_sat_f64_u",
-    "i64.trunc_sat_f32_s",
-    "i64.trunc_sat_f32_u",
-    "i64.trunc_sat_f64_s",
-    "i64.trunc_sat_f64_u"
-  ],
-  bulk_memory: ["memory.copy", "memory.fill"],
-  return_call: ["return_call", "return_call_indirect"],
-  i31ref: ["ref.i31", "i31.get_s", "i31.get_u"],
-  extended_const: ["global.get"],
-  // in const context - detected specially
-  multi_value: [],
-  // detected by result count
-  gc: [
-    "struct.new",
-    "struct.get",
-    "struct.set",
-    "array.new",
-    "array.get",
-    "array.set",
-    "array.len",
-    "struct.new_default",
-    "array.new_default",
-    "array.new_fixed",
-    "array.copy"
-  ],
-  ref_cast: ["ref.test", "ref.cast", "br_on_cast", "br_on_cast_fail"]
-};
-var ALL = Object.keys(FEATURES);
-var normalize2 = (opts) => {
-  if (opts === true) return Object.fromEntries(ALL.map((f) => [f, true]));
-  if (opts === false) return {};
-  if (typeof opts === "string") {
-    const set = new Set(opts.split(/\s+/).filter(Boolean));
-    return Object.fromEntries(ALL.map((f) => [f, set.has(f) || set.has("all")]));
-  }
-  return { ...opts };
-};
-var walk = (node, fn, parent, idx) => {
-  fn(node, parent, idx);
-  if (Array.isArray(node)) for (let i = 0; i < node.length; i++) walk(node[i], fn, node, i);
-};
-var walkPost = (node, fn, parent, idx) => {
-  if (Array.isArray(node)) for (let i = 0; i < node.length; i++) walkPost(node[i], fn, node, i);
-  fn(node, parent, idx);
-};
-var detect = (ast) => {
-  const used = /* @__PURE__ */ new Set();
-  walk(ast, (node) => {
-    if (typeof node !== "string") return;
-    for (const [feat, ops] of Object.entries(FEATURES)) {
-      if (ops.some((op) => node === op || node.startsWith(op + " "))) used.add(feat);
-    }
-  });
-  walk(ast, (node) => {
-    if (!Array.isArray(node) || node[0] !== "global") return;
-    for (const init of node) {
-      if (!Array.isArray(init)) continue;
-      if (init[0] === "i32.add" || init[0] === "i32.sub" || init[0] === "i32.mul" || init[0] === "i64.add" || init[0] === "i64.sub" || init[0] === "i64.mul") {
-        walk(init, (inner) => {
-          if (Array.isArray(inner) && inner[0] === "global.get") used.add("extended_const");
-        });
-      }
-    }
-  });
-  walk(ast, (node) => {
-    if (!Array.isArray(node) || node[0] !== "func") return;
-    let resultCount = 0;
-    for (const part of node) {
-      if (Array.isArray(part) && part[0] === "result") {
-        resultCount += part.length - 1;
-      }
-    }
-    if (resultCount > 1) used.add("multi_value");
-  });
-  return used;
-};
-var clone = (node) => Array.isArray(node) ? node.map(clone) : node;
 var findNodes = (ast, kind) => {
   const nodes = [];
   const start = ast[0] === "module" ? 1 : 0;
@@ -2319,7 +2256,6 @@ var funcref = (ast, ctx) => {
   });
   return ast;
 };
-var transforms = { funcref };
 var SIGN_EXT_SHIFTS = {
   "i32.extend8_s": ["i32", 24],
   "i32.extend16_s": ["i32", 16],
@@ -2342,7 +2278,6 @@ var sign_ext = (ast, ctx) => {
   });
   return ast;
 };
-transforms.sign_ext = sign_ext;
 var TRUNC_SAT_INFO = {
   "i32.trunc_sat_f32_s": { itype: "i32", ftype: "f32", signed: true, min: -2147483648, max: 2147483647 },
   "i32.trunc_sat_f32_u": { itype: "i32", ftype: "f32", signed: false, min: 0, max: 4294967295 },
@@ -2410,7 +2345,6 @@ var nontrapping = (ast, ctx) => {
   });
   return ast;
 };
-transforms.nontrapping = nontrapping;
 var bulk_memory = (ast, ctx) => {
   const needsCopy = /* @__PURE__ */ new Set(), needsFill = /* @__PURE__ */ new Set();
   walk(ast, (node) => {
@@ -2502,7 +2436,6 @@ var bulk_memory = (ast, ctx) => {
   });
   return ast;
 };
-transforms.bulk_memory = bulk_memory;
 var return_call_transform = (ast, ctx) => {
   let hasAnyTailCall = false;
   walk(ast, (node) => {
@@ -2522,7 +2455,6 @@ var return_call_transform = (ast, ctx) => {
   });
   return ast;
 };
-transforms.return_call = return_call_transform;
 var i31ref = (ast, ctx) => {
   walkPost(ast, (node, parent, idx) => {
     if (!Array.isArray(node) || !parent) return;
@@ -2539,7 +2471,6 @@ var i31ref = (ast, ctx) => {
   });
   return ast;
 };
-transforms.i31ref = i31ref;
 var extended_const = (ast, ctx) => {
   const globals2 = {};
   walk(ast, (node) => {
@@ -2602,7 +2533,6 @@ var extended_const = (ast, ctx) => {
   });
   return ast;
 };
-transforms.extended_const = extended_const;
 var multi_value = (ast, ctx) => {
   const multiResultFuncs = /* @__PURE__ */ new Map();
   const returnGlobals = [];
@@ -2651,7 +2581,6 @@ var multi_value = (ast, ctx) => {
   });
   return ast;
 };
-transforms.multi_value = multi_value;
 var TYPE_SIZES = { i32: 4, i64: 8, f32: 4, f64: 8 };
 var gc = (ast, ctx) => {
   const types = /* @__PURE__ */ new Map();
@@ -2895,7 +2824,6 @@ var gc = (ast, ctx) => {
   });
   return ast;
 };
-transforms.gc = gc;
 var ref_cast = (ast, ctx) => {
   const typeIndices = /* @__PURE__ */ new Map();
   let typeIdx = 1;
@@ -3039,77 +2967,94 @@ var ref_cast = (ast, ctx) => {
   });
   return ast;
 };
-transforms.ref_cast = ref_cast;
+var POLYFILLS = [
+  ["funcref", ["ref.func", "call_ref", "return_call_ref"], funcref],
+  ["sign_ext", ["i32.extend8_s", "i32.extend16_s", "i64.extend8_s", "i64.extend16_s", "i64.extend32_s"], sign_ext],
+  ["nontrapping", [
+    "i32.trunc_sat_f32_s",
+    "i32.trunc_sat_f32_u",
+    "i32.trunc_sat_f64_s",
+    "i32.trunc_sat_f64_u",
+    "i64.trunc_sat_f32_s",
+    "i64.trunc_sat_f32_u",
+    "i64.trunc_sat_f64_s",
+    "i64.trunc_sat_f64_u"
+  ], nontrapping],
+  ["bulk_memory", ["memory.copy", "memory.fill"], bulk_memory],
+  ["return_call", ["return_call", "return_call_indirect"], return_call_transform],
+  ["i31ref", ["ref.i31", "i31.get_s", "i31.get_u"], i31ref],
+  ["extended_const", ["global.get"], extended_const],
+  // global.get in a const initializer — also detected specially
+  ["multi_value", [], multi_value],
+  // functions with >1 result — detected by result count
+  ["gc", [
+    "struct.new",
+    "struct.get",
+    "struct.set",
+    "array.new",
+    "array.get",
+    "array.set",
+    "array.len",
+    "struct.new_default",
+    "array.new_default",
+    "array.new_fixed",
+    "array.copy"
+  ], gc],
+  ["ref_cast", ["ref.test", "ref.cast", "br_on_cast", "br_on_cast_fail"], ref_cast]
+];
+var FEATURES = Object.fromEntries(POLYFILLS.map((p) => [p[0], p[1]]));
+var normalize2 = (opts) => {
+  if (opts === false) return {};
+  if (opts !== true && typeof opts !== "string") return { ...opts };
+  const set = typeof opts === "string" ? new Set(opts.split(/\s+/).filter(Boolean)) : null;
+  const m = {};
+  for (const p of POLYFILLS) m[p[0]] = set ? set.has("all") || set.has(p[0]) : true;
+  return m;
+};
+var detect = (ast) => {
+  const used = /* @__PURE__ */ new Set();
+  walk(ast, (node) => {
+    if (typeof node !== "string") return;
+    for (const p of POLYFILLS) {
+      const ops = p[1];
+      if (ops.some((op) => node === op || node.startsWith(op + " "))) used.add(p[0]);
+    }
+  });
+  walk(ast, (node) => {
+    if (!Array.isArray(node) || node[0] !== "global") return;
+    for (const init of node) {
+      if (!Array.isArray(init)) continue;
+      if (init[0] === "i32.add" || init[0] === "i32.sub" || init[0] === "i32.mul" || init[0] === "i64.add" || init[0] === "i64.sub" || init[0] === "i64.mul") {
+        walk(init, (inner) => {
+          if (Array.isArray(inner) && inner[0] === "global.get") used.add("extended_const");
+        });
+      }
+    }
+  });
+  walk(ast, (node) => {
+    if (!Array.isArray(node) || node[0] !== "func") return;
+    let resultCount = 0;
+    for (const part of node) {
+      if (Array.isArray(part) && part[0] === "result") resultCount += part.length - 1;
+    }
+    if (resultCount > 1) used.add("multi_value");
+  });
+  return used;
+};
 function polyfill(ast, opts = true) {
   if (typeof ast === "string") ast = parse_default(ast);
   ast = clone(ast);
   opts = normalize2(opts);
   const used = detect(ast);
   const ctx = { uid: 0 };
-  for (const feat of ALL) {
-    if (used.has(feat) && opts[feat] !== false && transforms[feat]) {
-      ast = transforms[feat](ast, ctx);
-    }
+  for (const p of POLYFILLS) {
+    const fn = p[2];
+    if (used.has(p[0]) && opts[p[0]] !== false) ast = fn(ast, ctx);
   }
   return ast;
 }
 
 // src/optimize.js
-var OPTS = {
-  treeshake: true,
-  // remove unused funcs/globals/types/tables
-  fold: true,
-  // constant folding
-  deadcode: true,
-  // eliminate dead code after unreachable/br/return
-  locals: true,
-  // remove unused locals
-  identity: true,
-  // remove identity ops (x + 0 → x)
-  strength: true,
-  // strength reduction (x * 2 → x << 1)
-  branch: true,
-  // simplify constant branches
-  propagate: true,
-  // forward-propagate single-use locals & tiny consts (never inflates)
-  inline: false,
-  // inline tiny functions — can duplicate bodies
-  inlineOnce: true,
-  // inline single-call functions into their lone caller (never duplicates)
-  vacuum: true,
-  // remove nops, drop-of-pure, empty branches
-  mergeBlocks: true,
-  // unwrap `(block $L …)` whose label is never targeted
-  coalesce: true,
-  // share local slots between same-type non-overlapping locals
-  peephole: true,
-  // x-x→0, x&0→0, etc.
-  globals: true,
-  // propagate immutable global constants
-  offset: true,
-  // fold add+const into load/store offset
-  unbranch: true,
-  // remove redundant br at end of own block
-  loopify: true,
-  // collapse block+loop+brif while-idiom into loop+if
-  stripmut: true,
-  // strip mut from never-written globals
-  brif: true,
-  // if-then-br → br_if
-  foldarms: false,
-  // merge identical trailing if arms — can add block wrapper
-  dedupe: true,
-  // eliminate duplicate functions
-  reorder: false,
-  // put hot functions first — no AST reduction
-  dedupTypes: true,
-  // merge identical type definitions
-  packData: true,
-  // trim trailing zeros, merge adjacent data segments
-  minifyImports: false
-  // shorten import names — enable only when you control the host
-};
-var ALL2 = Object.keys(OPTS);
 var binarySize = (ast) => {
   try {
     return compile(ast).length;
@@ -3126,34 +3071,6 @@ var equal = (a, b) => {
   for (let i = 0; i < a.length; i++) if (!equal(a[i], b[i])) return false;
   return true;
 };
-var normalize3 = (opts) => {
-  if (opts === true) return { ...OPTS };
-  if (opts === false) return {};
-  if (typeof opts === "string") {
-    const set = new Set(opts.split(/\s+/).filter(Boolean));
-    if (set.has("all")) return Object.fromEntries(ALL2.map((f) => [f, true]));
-    return Object.fromEntries(ALL2.map((f) => [f, set.has(f)]));
-  }
-  return { ...OPTS, ...opts };
-};
-var clone2 = (node) => {
-  if (!Array.isArray(node)) return node;
-  return node.map(clone2);
-};
-var walk2 = (node, fn, parent, idx) => {
-  fn(node, parent, idx);
-  if (Array.isArray(node)) for (let i = 0; i < node.length; i++) walk2(node[i], fn, node, i);
-};
-var walkPost2 = (node, fn, parent, idx) => {
-  if (Array.isArray(node)) {
-    for (let i = 0; i < node.length; i++) {
-      const result2 = walkPost2(node[i], fn, node, i);
-      if (result2 !== void 0) node[i] = result2;
-    }
-  }
-  const result = fn(node, parent, idx);
-  return result !== void 0 ? result : node;
-};
 var parseIf = (node) => {
   let condIdx = 1;
   while (condIdx < node.length) {
@@ -3254,7 +3171,7 @@ var treeshake = (ast) => {
     markFunc(ref);
   }
   for (const elem of elems) {
-    walk2(elem, (n) => {
+    walk(elem, (n) => {
       if (Array.isArray(n) && n[0] === "ref.func") markFunc(n[1]);
       else if (typeof n === "string" && n[0] === "$") markFunc(n);
     });
@@ -3276,7 +3193,7 @@ var treeshake = (ast) => {
     if (entry.scanned) continue;
     entry.scanned = true;
     if (entry.isImport) continue;
-    walk2(entry.node, (n) => {
+    walk(entry.node, (n) => {
       if (!Array.isArray(n)) {
         if (typeof n === "string" && n[0] === "$") markFunc(n);
         return;
@@ -3348,120 +3265,120 @@ var i64c = (fn) => (a, b) => fn(a, b) ? 1 : 0;
 var u64c = (fn) => (a, b) => fn(BigInt.asUintN(64, a), BigInt.asUintN(64, b)) ? 1 : 0;
 var FOLDABLE = {
   // i32 arithmetic
-  "i32.add": [(a, b) => a + b | 0, "i32"],
-  "i32.sub": [(a, b) => a - b | 0, "i32"],
-  "i32.mul": [(a, b) => Math.imul(a, b), "i32"],
-  "i32.div_s": [(a, b) => b !== 0 ? a / b | 0 : null, "i32"],
-  "i32.div_u": [(a, b) => b !== 0 ? (a >>> 0) / (b >>> 0) | 0 : null, "i32"],
-  "i32.rem_s": [(a, b) => b !== 0 ? a % b | 0 : null, "i32"],
-  "i32.rem_u": [(a, b) => b !== 0 ? (a >>> 0) % (b >>> 0) | 0 : null, "i32"],
-  "i32.and": [(a, b) => a & b, "i32"],
-  "i32.or": [(a, b) => a | b, "i32"],
-  "i32.xor": [(a, b) => a ^ b, "i32"],
-  "i32.shl": [(a, b) => a << (b & 31), "i32"],
-  "i32.shr_s": [(a, b) => a >> (b & 31), "i32"],
-  "i32.shr_u": [(a, b) => a >>> (b & 31), "i32"],
-  "i32.rotl": [(a, b) => {
+  "i32.add": (a, b) => a + b | 0,
+  "i32.sub": (a, b) => a - b | 0,
+  "i32.mul": (a, b) => Math.imul(a, b),
+  "i32.div_s": (a, b) => b !== 0 ? a / b | 0 : null,
+  "i32.div_u": (a, b) => b !== 0 ? (a >>> 0) / (b >>> 0) | 0 : null,
+  "i32.rem_s": (a, b) => b !== 0 ? a % b | 0 : null,
+  "i32.rem_u": (a, b) => b !== 0 ? (a >>> 0) % (b >>> 0) | 0 : null,
+  "i32.and": (a, b) => a & b,
+  "i32.or": (a, b) => a | b,
+  "i32.xor": (a, b) => a ^ b,
+  "i32.shl": (a, b) => a << (b & 31),
+  "i32.shr_s": (a, b) => a >> (b & 31),
+  "i32.shr_u": (a, b) => a >>> (b & 31),
+  "i32.rotl": (a, b) => {
     b &= 31;
     return a << b | a >>> 32 - b | 0;
-  }, "i32"],
-  "i32.rotr": [(a, b) => {
+  },
+  "i32.rotr": (a, b) => {
     b &= 31;
     return a >>> b | a << 32 - b | 0;
-  }, "i32"],
-  "i32.eq": [i32c((a, b) => a === b), "i32"],
-  "i32.ne": [i32c((a, b) => a !== b), "i32"],
-  "i32.lt_s": [i32c((a, b) => a < b), "i32"],
-  "i32.lt_u": [u32c((a, b) => a < b), "i32"],
-  "i32.gt_s": [i32c((a, b) => a > b), "i32"],
-  "i32.gt_u": [u32c((a, b) => a > b), "i32"],
-  "i32.le_s": [i32c((a, b) => a <= b), "i32"],
-  "i32.le_u": [u32c((a, b) => a <= b), "i32"],
-  "i32.ge_s": [i32c((a, b) => a >= b), "i32"],
-  "i32.ge_u": [u32c((a, b) => a >= b), "i32"],
-  "i32.eqz": [(a) => a === 0 ? 1 : 0, "i32"],
-  "i32.clz": [(a) => Math.clz32(a), "i32"],
-  "i32.ctz": [(a) => a === 0 ? 32 : 31 - Math.clz32(a & -a), "i32"],
-  "i32.popcnt": [(a) => {
+  },
+  "i32.eq": i32c((a, b) => a === b),
+  "i32.ne": i32c((a, b) => a !== b),
+  "i32.lt_s": i32c((a, b) => a < b),
+  "i32.lt_u": u32c((a, b) => a < b),
+  "i32.gt_s": i32c((a, b) => a > b),
+  "i32.gt_u": u32c((a, b) => a > b),
+  "i32.le_s": i32c((a, b) => a <= b),
+  "i32.le_u": u32c((a, b) => a <= b),
+  "i32.ge_s": i32c((a, b) => a >= b),
+  "i32.ge_u": u32c((a, b) => a >= b),
+  "i32.eqz": (a) => a === 0 ? 1 : 0,
+  "i32.clz": (a) => Math.clz32(a),
+  "i32.ctz": (a) => a === 0 ? 32 : 31 - Math.clz32(a & -a),
+  "i32.popcnt": (a) => {
     let c = 0;
     while (a) {
       c += a & 1;
       a >>>= 1;
     }
     return c;
-  }, "i32"],
-  "i32.wrap_i64": [(a) => Number(BigInt.asIntN(32, a)), "i32"],
-  "i32.extend8_s": [(a) => a << 24 >> 24, "i32"],
-  "i32.extend16_s": [(a) => a << 16 >> 16, "i32"],
+  },
+  "i32.wrap_i64": (a) => Number(BigInt.asIntN(32, a)),
+  "i32.extend8_s": (a) => a << 24 >> 24,
+  "i32.extend16_s": (a) => a << 16 >> 16,
   // i64 (using BigInt)
-  "i64.add": [(a, b) => BigInt.asIntN(64, a + b), "i64"],
-  "i64.sub": [(a, b) => BigInt.asIntN(64, a - b), "i64"],
-  "i64.mul": [(a, b) => BigInt.asIntN(64, a * b), "i64"],
-  "i64.div_s": [(a, b) => b !== 0n ? BigInt.asIntN(64, a / b) : null, "i64"],
-  "i64.div_u": [(a, b) => b !== 0n ? BigInt.asUintN(64, BigInt.asUintN(64, a) / BigInt.asUintN(64, b)) : null, "i64"],
-  "i64.rem_s": [(a, b) => b !== 0n ? BigInt.asIntN(64, a % b) : null, "i64"],
-  "i64.rem_u": [(a, b) => b !== 0n ? BigInt.asUintN(64, BigInt.asUintN(64, a) % BigInt.asUintN(64, b)) : null, "i64"],
-  "i64.and": [(a, b) => BigInt.asIntN(64, a & b), "i64"],
-  "i64.or": [(a, b) => BigInt.asIntN(64, a | b), "i64"],
-  "i64.xor": [(a, b) => BigInt.asIntN(64, a ^ b), "i64"],
-  "i64.shl": [(a, b) => BigInt.asIntN(64, a << (b & 63n)), "i64"],
-  "i64.shr_s": [(a, b) => BigInt.asIntN(64, a >> (b & 63n)), "i64"],
-  "i64.shr_u": [(a, b) => BigInt.asUintN(64, BigInt.asUintN(64, a) >> (b & 63n)), "i64"],
-  "i64.eq": [i64c((a, b) => a === b), "i32"],
-  "i64.ne": [i64c((a, b) => a !== b), "i32"],
-  "i64.lt_s": [i64c((a, b) => a < b), "i32"],
-  "i64.lt_u": [u64c((a, b) => a < b), "i32"],
-  "i64.gt_s": [i64c((a, b) => a > b), "i32"],
-  "i64.gt_u": [u64c((a, b) => a > b), "i32"],
-  "i64.le_s": [i64c((a, b) => a <= b), "i32"],
-  "i64.le_u": [u64c((a, b) => a <= b), "i32"],
-  "i64.ge_s": [i64c((a, b) => a >= b), "i32"],
-  "i64.ge_u": [u64c((a, b) => a >= b), "i32"],
-  "i64.eqz": [(a) => a === 0n ? 1 : 0, "i32"],
-  "i64.extend_i32_s": [(a) => BigInt(a), "i64"],
-  "i64.extend_i32_u": [(a) => BigInt(a >>> 0), "i64"],
-  "i64.extend8_s": [(a) => BigInt.asIntN(64, BigInt.asIntN(8, a)), "i64"],
-  "i64.extend16_s": [(a) => BigInt.asIntN(64, BigInt.asIntN(16, a)), "i64"],
-  "i64.extend32_s": [(a) => BigInt.asIntN(64, BigInt.asIntN(32, a)), "i64"],
+  "i64.add": (a, b) => BigInt.asIntN(64, a + b),
+  "i64.sub": (a, b) => BigInt.asIntN(64, a - b),
+  "i64.mul": (a, b) => BigInt.asIntN(64, a * b),
+  "i64.div_s": (a, b) => b !== 0n ? BigInt.asIntN(64, a / b) : null,
+  "i64.div_u": (a, b) => b !== 0n ? BigInt.asUintN(64, BigInt.asUintN(64, a) / BigInt.asUintN(64, b)) : null,
+  "i64.rem_s": (a, b) => b !== 0n ? BigInt.asIntN(64, a % b) : null,
+  "i64.rem_u": (a, b) => b !== 0n ? BigInt.asUintN(64, BigInt.asUintN(64, a) % BigInt.asUintN(64, b)) : null,
+  "i64.and": (a, b) => BigInt.asIntN(64, a & b),
+  "i64.or": (a, b) => BigInt.asIntN(64, a | b),
+  "i64.xor": (a, b) => BigInt.asIntN(64, a ^ b),
+  "i64.shl": (a, b) => BigInt.asIntN(64, a << (b & 63n)),
+  "i64.shr_s": (a, b) => BigInt.asIntN(64, a >> (b & 63n)),
+  "i64.shr_u": (a, b) => BigInt.asUintN(64, BigInt.asUintN(64, a) >> (b & 63n)),
+  "i64.eq": i64c((a, b) => a === b),
+  "i64.ne": i64c((a, b) => a !== b),
+  "i64.lt_s": i64c((a, b) => a < b),
+  "i64.lt_u": u64c((a, b) => a < b),
+  "i64.gt_s": i64c((a, b) => a > b),
+  "i64.gt_u": u64c((a, b) => a > b),
+  "i64.le_s": i64c((a, b) => a <= b),
+  "i64.le_u": u64c((a, b) => a <= b),
+  "i64.ge_s": i64c((a, b) => a >= b),
+  "i64.ge_u": u64c((a, b) => a >= b),
+  "i64.eqz": (a) => a === 0n ? 1 : 0,
+  "i64.extend_i32_s": (a) => BigInt(a),
+  "i64.extend_i32_u": (a) => BigInt(a >>> 0),
+  "i64.extend8_s": (a) => BigInt.asIntN(64, BigInt.asIntN(8, a)),
+  "i64.extend16_s": (a) => BigInt.asIntN(64, BigInt.asIntN(16, a)),
+  "i64.extend32_s": (a) => BigInt.asIntN(64, BigInt.asIntN(32, a)),
   // f32/f64 (NaN/precision-aware via Math.fround)
-  "f32.add": [(a, b) => Math.fround(a + b), "f32"],
-  "f32.sub": [(a, b) => Math.fround(a - b), "f32"],
-  "f32.mul": [(a, b) => Math.fround(a * b), "f32"],
-  "f32.div": [(a, b) => Math.fround(a / b), "f32"],
-  "f32.neg": [(a) => Math.fround(-a), "f32"],
-  "f32.abs": [(a) => Math.fround(Math.abs(a)), "f32"],
-  "f32.sqrt": [(a) => Math.fround(Math.sqrt(a)), "f32"],
-  "f32.ceil": [(a) => Math.fround(Math.ceil(a)), "f32"],
-  "f32.floor": [(a) => Math.fround(Math.floor(a)), "f32"],
-  "f32.trunc": [(a) => Math.fround(Math.trunc(a)), "f32"],
-  "f32.nearest": [(a) => Math.fround(roundEven(a)), "f32"],
-  "f64.add": [(a, b) => a + b, "f64"],
-  "f64.sub": [(a, b) => a - b, "f64"],
-  "f64.mul": [(a, b) => a * b, "f64"],
-  "f64.div": [(a, b) => a / b, "f64"],
-  "f64.neg": [(a) => -a, "f64"],
-  "f64.abs": [Math.abs, "f64"],
-  "f64.sqrt": [Math.sqrt, "f64"],
-  "f64.ceil": [Math.ceil, "f64"],
-  "f64.floor": [Math.floor, "f64"],
-  "f64.trunc": [Math.trunc, "f64"],
-  "f64.nearest": [roundEven, "f64"],
+  "f32.add": (a, b) => Math.fround(a + b),
+  "f32.sub": (a, b) => Math.fround(a - b),
+  "f32.mul": (a, b) => Math.fround(a * b),
+  "f32.div": (a, b) => Math.fround(a / b),
+  "f32.neg": (a) => Math.fround(-a),
+  "f32.abs": (a) => Math.fround(Math.abs(a)),
+  "f32.sqrt": (a) => Math.fround(Math.sqrt(a)),
+  "f32.ceil": (a) => Math.fround(Math.ceil(a)),
+  "f32.floor": (a) => Math.fround(Math.floor(a)),
+  "f32.trunc": (a) => Math.fround(Math.trunc(a)),
+  "f32.nearest": (a) => Math.fround(roundEven(a)),
+  "f64.add": (a, b) => a + b,
+  "f64.sub": (a, b) => a - b,
+  "f64.mul": (a, b) => a * b,
+  "f64.div": (a, b) => a / b,
+  "f64.neg": (a) => -a,
+  "f64.abs": Math.abs,
+  "f64.sqrt": Math.sqrt,
+  "f64.ceil": Math.ceil,
+  "f64.floor": Math.floor,
+  "f64.trunc": Math.trunc,
+  "f64.nearest": roundEven,
   // Bit-exact reinterprets (preserve NaN payloads)
-  "i32.reinterpret_f32": [i32FromF32, "i32"],
-  "f32.reinterpret_i32": [f32FromI32, "f32"],
-  "i64.reinterpret_f64": [i64FromF64, "i64"],
-  "f64.reinterpret_i64": [f64FromI64, "f64"],
+  "i32.reinterpret_f32": i32FromF32,
+  "f32.reinterpret_i32": f32FromI32,
+  "i64.reinterpret_f64": i64FromF64,
+  "f64.reinterpret_i64": f64FromI64,
   // Numeric conversions (value-preserving where representable)
-  "f32.convert_i32_s": [(a) => Math.fround(a | 0), "f32"],
-  "f32.convert_i32_u": [(a) => Math.fround(a >>> 0), "f32"],
-  "f32.convert_i64_s": [(a) => Math.fround(Number(BigInt.asIntN(64, a))), "f32"],
-  "f32.convert_i64_u": [(a) => Math.fround(Number(BigInt.asUintN(64, a))), "f32"],
-  "f64.convert_i32_s": [(a) => a | 0, "f64"],
-  "f64.convert_i32_u": [(a) => a >>> 0, "f64"],
-  "f64.convert_i64_s": [(a) => Number(BigInt.asIntN(64, a)), "f64"],
-  "f64.convert_i64_u": [(a) => Number(BigInt.asUintN(64, a)), "f64"],
-  "f32.demote_f64": [(a) => Math.fround(a), "f32"],
-  "f64.promote_f32": [(a) => Math.fround(a), "f64"]
+  "f32.convert_i32_s": (a) => Math.fround(a | 0),
+  "f32.convert_i32_u": (a) => Math.fround(a >>> 0),
+  "f32.convert_i64_s": (a) => Math.fround(Number(BigInt.asIntN(64, a))),
+  "f32.convert_i64_u": (a) => Math.fround(Number(BigInt.asUintN(64, a))),
+  "f64.convert_i32_s": (a) => a | 0,
+  "f64.convert_i32_u": (a) => a >>> 0,
+  "f64.convert_i64_s": (a) => Number(BigInt.asIntN(64, a)),
+  "f64.convert_i64_u": (a) => Number(BigInt.asUintN(64, a)),
+  "f32.demote_f64": (a) => Math.fround(a),
+  "f64.promote_f32": (a) => Math.fround(a)
 };
 var _parseNanF64 = (s, i = s?.indexOf?.("nan")) => {
   if (i < 0 || i == null) return null;
@@ -3478,8 +3395,8 @@ var _parseNanF32 = (s, i = s?.indexOf?.("nan")) => {
 var getConst = (node) => {
   if (!Array.isArray(node) || node.length !== 2) return null;
   const [op, val] = node;
-  if (op === "i32.const") return { type: "i32", value: Number(val) | 0 };
-  if (op === "i64.const") return { type: "i64", value: BigInt(val) };
+  if (op === "i32.const") return { type: "i32", value: (typeof val === "string" ? i32.parse(val) : val) | 0 };
+  if (op === "i64.const") return { type: "i64", value: typeof val === "string" ? i64.parse(val) : BigInt(val) };
   if (op === "f32.const") {
     const n = _parseNanF32(val);
     return { type: "f32", value: n !== null ? n : Math.fround(Number(val)) };
@@ -3498,24 +3415,23 @@ var makeConst = (type, value) => {
   return null;
 };
 var fold = (ast) => {
-  return walkPost2(ast, (node) => {
+  return walkPost(ast, (node) => {
     if (!Array.isArray(node)) return;
-    const entry = FOLDABLE[node[0]];
-    if (!entry) return;
-    const [fn, t] = entry;
+    const fn = FOLDABLE[node[0]];
+    if (!fn) return;
     if (fn.length === 1 && node.length === 2) {
       const a = getConst(node[1]);
       if (!a) return;
       const r = fn(a.value);
       if (r === null) return;
-      return makeConst(t, r);
+      return makeConst(resultType(node[0]), r);
     }
     if (fn.length === 2 && node.length === 3) {
       const a = getConst(node[1]), b = getConst(node[2]);
       if (!a || !b) return;
       const r = fn(a.value, b.value);
       if (r === null) return;
-      return makeConst(t, r);
+      return makeConst(resultType(node[0]), r);
     }
   });
 };
@@ -3561,7 +3477,7 @@ var IDENTITIES = {
   // f * 1 → x (careful with NaN, skip for floats)
 };
 var identity = (ast) => {
-  return walkPost2(ast, (node) => {
+  return walkPost(ast, (node) => {
     if (!Array.isArray(node) || node.length !== 3) return;
     const fn = IDENTITIES[node[0]];
     if (!fn) return;
@@ -3571,7 +3487,7 @@ var identity = (ast) => {
   });
 };
 var strength = (ast) => {
-  return walkPost2(ast, (node) => {
+  return walkPost(ast, (node) => {
     if (!Array.isArray(node) || node.length !== 3) return;
     const [op, a, b] = node;
     if (op === "i32.mul") {
@@ -3627,7 +3543,7 @@ var strength = (ast) => {
   });
 };
 var branch = (ast) => {
-  return walkPost2(ast, (node) => {
+  return walkPost(ast, (node) => {
     if (!Array.isArray(node)) return;
     const op = node[0];
     if (op === "if") {
@@ -3659,7 +3575,7 @@ var branch = (ast) => {
 };
 var TERMINATORS = /* @__PURE__ */ new Set(["unreachable", "return", "br", "br_table"]);
 var deadcode = (ast) => {
-  walk2(ast, (node) => {
+  walk(ast, (node) => {
     if (!Array.isArray(node)) return;
     const kind = node[0];
     if (kind === "func" || kind === "block" || kind === "loop") {
@@ -3705,7 +3621,7 @@ var eliminateDeadInBlock = (block) => {
   }
 };
 var localReuse = (ast) => {
-  walk2(ast, (node) => {
+  walk(ast, (node) => {
     if (!Array.isArray(node) || node[0] !== "func") return;
     const localDecls = [];
     const localTypes = /* @__PURE__ */ new Map();
@@ -3726,7 +3642,7 @@ var localReuse = (ast) => {
         }
       }
     }
-    walk2(node, (n) => {
+    walk(node, (n) => {
       if (!Array.isArray(n)) return;
       const op = n[0];
       if (op === "local.get" || op === "local.set" || op === "local.tee") {
@@ -3799,7 +3715,7 @@ var countLocalUses = (node) => {
     if (!counts.has(name2)) counts.set(name2, { gets: 0, sets: 0, tees: 0 });
     return counts.get(name2);
   };
-  walk2(node, (n) => {
+  walk(node, (n) => {
     if (!Array.isArray(n) || n.length < 2 || typeof n[1] !== "string") return;
     if (n[0] === "local.get") ensure(n[1]).gets++;
     else if (n[0] === "local.set") ensure(n[1]).sets++;
@@ -3824,7 +3740,7 @@ var canSubst = (k) => k.pure && k.singleUse || isTinyConst(k.val);
 var purgeRefs = (known, name2) => {
   for (const [key, tracked] of known) {
     let refs = false;
-    walk2(tracked.val, (n) => {
+    walk(tracked.val, (n) => {
       if (Array.isArray(n) && (n[0] === "local.get" || n[0] === "local.tee") && n[1] === name2) refs = true;
     });
     if (refs) known.delete(key);
@@ -3854,13 +3770,13 @@ var substGets = (node, known) => {
   const op = node[0];
   if (op === "local.get" && node.length === 2) {
     const k = typeof node[1] === "string" && known.get(node[1]);
-    if (k && canSubst(k)) return clone2(k.val);
+    if (k && canSubst(k)) return clone(k.val);
     return node;
   }
   let inner = known;
   if (op === "block" || op === "loop" || op === "if") {
     let cloned = null;
-    walk2(node, (n) => {
+    walk(node, (n) => {
       if (!Array.isArray(n)) return;
       if ((n[0] === "local.set" || n[0] === "local.tee") && typeof n[1] === "string" && known.has(n[1])) {
         if (!cloned) cloned = new Map(known);
@@ -3873,7 +3789,7 @@ var substGets = (node, known) => {
     const r = substGets(node[i], inner);
     if (r !== node[i]) node[i] = r;
     if (i + 1 < node.length && Array.isArray(node[i])) {
-      walk2(node[i], (n) => {
+      walk(node[i], (n) => {
         if (!Array.isArray(n)) return;
         if ((n[0] === "local.set" || n[0] === "local.tee") && typeof n[1] === "string") {
           if (inner === known) inner = new Map(known);
@@ -3920,7 +3836,7 @@ var forwardPropagate = (funcNode, params, useCounts) => {
     if (op === "local.get" && instr2.length === 2 && typeof instr2[1] === "string") {
       const tracked = known.get(instr2[1]);
       if (tracked && canSubst(tracked)) {
-        const replacement = clone2(tracked.val);
+        const replacement = clone(tracked.val);
         instr2.length = 0;
         instr2.push(...Array.isArray(replacement) ? replacement : [replacement]);
         changed = true;
@@ -3928,10 +3844,10 @@ var forwardPropagate = (funcNode, params, useCounts) => {
       }
     }
     if (op !== "block" && op !== "loop" && op !== "if") {
-      const prev = clone2(instr2);
+      const prev = clone(instr2);
       substGets(instr2, known);
       if (!equal(prev, instr2)) changed = true;
-      walk2(instr2, (n) => {
+      walk(instr2, (n) => {
         if (Array.isArray(n) && (n[0] === "local.set" || n[0] === "local.tee") && typeof n[1] === "string") {
           known.delete(n[1]);
           purgeRefs(known, n[1]);
@@ -3955,7 +3871,7 @@ var eliminateSetGetPairs = (funcNode, params, useCounts) => {
     if (getNode[1] !== name2 || params.has(name2)) continue;
     const uses = useCounts.get(name2) || { gets: 0, sets: 0, tees: 0 };
     if (uses.sets !== 1 || uses.gets !== 1 || uses.tees !== 0) continue;
-    const expr2 = clone2(setNode[2]);
+    const expr2 = clone(setNode[2]);
     funcNode.splice(i, 2, ...Array.isArray(expr2) ? [expr2] : [expr2]);
     changed = true;
     i--;
@@ -3973,7 +3889,7 @@ var createLocalTees = (funcNode, params, useCounts) => {
     if (getNode[1] !== name2 || params.has(name2)) continue;
     const uses = useCounts.get(name2) || { gets: 0, sets: 0, tees: 0 };
     if (uses.sets + uses.gets + uses.tees <= 2) continue;
-    funcNode.splice(i, 2, ["local.tee", name2, clone2(setNode[2])]);
+    funcNode.splice(i, 2, ["local.tee", name2, clone(setNode[2])]);
     changed = true;
   }
   return changed;
@@ -4006,13 +3922,13 @@ var eliminateDeadStores = (funcNode, params, useCounts) => {
 };
 var isScopeNode = (n) => Array.isArray(n) && (n[0] === "func" || n[0] === "block" || n[0] === "loop" || n[0] === "then" || n[0] === "else");
 var propagate = (ast) => {
-  walk2(ast, (funcNode) => {
+  walk(ast, (funcNode) => {
     if (!Array.isArray(funcNode) || funcNode[0] !== "func") return;
     const params = /* @__PURE__ */ new Set();
     for (const sub of funcNode)
       if (Array.isArray(sub) && sub[0] === "param" && typeof sub[1] === "string") params.add(sub[1]);
     const scopes = [];
-    walkPost2(funcNode, (n) => {
+    walkPost(funcNode, (n) => {
       if (isScopeNode(n)) scopes.push(n);
     });
     for (let round = 0; round < 6; round++) {
@@ -4062,7 +3978,7 @@ var inline = (ast) => {
       const paramNames = new Set(params.map((p) => p.name));
       let mutatesParam = false;
       let hasReturn = false;
-      walk2(body[0], (n) => {
+      walk(body[0], (n) => {
         if (!Array.isArray(n)) return;
         if ((n[0] === "local.set" || n[0] === "local.tee") && paramNames.has(n[1])) {
           mutatesParam = true;
@@ -4077,22 +3993,21 @@ var inline = (ast) => {
     }
   }
   if (inlinable.size === 0) return ast;
-  walkPost2(ast, (node) => {
+  walkPost(ast, (node) => {
     if (!Array.isArray(node) || node[0] !== "call") return;
     const fname = node[1];
     if (!inlinable.has(fname)) return;
     const { body, params } = inlinable.get(fname);
     const args = node.slice(2);
     if (params.length === 0) {
-      return clone2(body);
+      return clone(body);
     }
-    const substituted = clone2(body);
-    walkPost2(substituted, (n) => {
+    const substituted = walkPost(clone(body), (n) => {
       if (!Array.isArray(n) || n[0] !== "local.get") return;
       const local = n[1];
       const paramIdx = params.findIndex((p) => p.name === local);
       if (paramIdx !== -1 && args[paramIdx]) {
-        return clone2(args[paramIdx]);
+        return clone(args[paramIdx]);
       }
     });
     return substituted;
@@ -4231,13 +4146,13 @@ var inlineOnce = (ast) => {
     if (!calleeName) break;
     const callee = funcByName.get(calleeName);
     const params = [], locals = [];
-    let resultType = null;
+    let inlResult = null;
     for (let i = 2; i < callee.length; i++) {
       const c = callee[i];
       if (typeof c === "string" || !Array.isArray(c)) continue;
       if (c[0] === "param") params.push({ name: c[1], type: c[2] });
       else if (c[0] === "result") {
-        if (c.length > 1) resultType = c[1];
+        if (c.length > 1) inlResult = c[1];
       } else if (c[0] === "local") locals.push({ name: c[1], type: c[2] });
       else if (c[0] === "export" || c[0] === "type") continue;
       else break;
@@ -4273,7 +4188,7 @@ var inlineOnce = (ast) => {
       if (fn === callee || done) continue;
       const start = bodyStart(fn);
       for (let i = start; i < fn.length; i++) {
-        const replaced = walkPost2(fn[i], (n) => {
+        const replaced = walkPost(fn[i], (n) => {
           if (done || !Array.isArray(n) || n[0] !== "call" || n[1] !== calleeName) return;
           const args = n.slice(2);
           if (args.length !== params.length) return;
@@ -4281,7 +4196,7 @@ var inlineOnce = (ast) => {
           const resets = locals.filter((l) => needsReset(cBody, l.name)).map((l) => ["local.set", rename.get(l.name), zeroFor(l.type)]);
           const inner = cBody.map(sub);
           done = true;
-          return resultType ? ["block", exit, ["result", resultType], ...setup, ...resets, ...inner] : ["block", exit, ...setup, ...resets, ...inner];
+          return inlResult ? ["block", exit, ["result", inlResult], ...setup, ...resets, ...inner] : ["block", exit, ...setup, ...resets, ...inner];
         });
         if (replaced !== fn[i]) fn[i] = replaced;
         if (done) {
@@ -4338,7 +4253,7 @@ var targetsLabel = (body, label) => {
   return found;
 };
 var mergeBlocks = (ast) => {
-  walkPost2(ast, (node) => {
+  walkPost(ast, (node) => {
     if (!Array.isArray(node) || node[0] !== "block") return;
     let bi = 1, label = null;
     if (typeof node[1] === "string" && node[1][0] === "$") {
@@ -4367,7 +4282,7 @@ var mergeBlocks = (ast) => {
     node.length = 0;
     for (const tok of only) node.push(tok);
   });
-  walk2(ast, (node) => {
+  walk(ast, (node) => {
     if (!isScopeNode(node)) return;
     let i = 1;
     while (i < node.length) {
@@ -4441,7 +4356,7 @@ var mergeBlocks = (ast) => {
   return ast;
 };
 var coalesceLocals = (ast) => {
-  walk2(ast, (funcNode) => {
+  walk(ast, (funcNode) => {
     if (!Array.isArray(funcNode) || funcNode[0] !== "func") return;
     const decls = /* @__PURE__ */ new Map();
     for (const sub of funcNode) {
@@ -4513,7 +4428,7 @@ var coalesceLocals = (ast) => {
       } else slots.push({ primary: name2, type, end: range.end });
     }
     if (rename.size === 0) return;
-    walk2(funcNode, (n) => {
+    walk(funcNode, (n) => {
       if (Array.isArray(n) && (n[0] === "local.get" || n[0] === "local.set" || n[0] === "local.tee") && rename.has(n[1])) {
         n[1] = rename.get(n[1]);
       }
@@ -4522,7 +4437,7 @@ var coalesceLocals = (ast) => {
   return ast;
 };
 var vacuum = (ast) => {
-  return walkPost2(ast, (node) => {
+  return walkPost(ast, (node) => {
     if (!Array.isArray(node)) return;
     const op = node[0];
     if (op === "nop") return ["nop"];
@@ -4562,10 +4477,6 @@ var PEEPHOLE = {
   "i64.sub": (a, b) => equal(a, b) ? ["i64.const", 0n] : null,
   "i32.xor": (a, b) => equal(a, b) ? ["i32.const", 0] : null,
   "i64.xor": (a, b) => equal(a, b) ? ["i64.const", 0n] : null,
-  "i32.and": (a, b) => equal(a, b) ? a : null,
-  "i64.and": (a, b) => equal(a, b) ? a : null,
-  "i32.or": (a, b) => equal(a, b) ? a : null,
-  "i64.or": (a, b) => equal(a, b) ? a : null,
   "i32.eq": (a, b) => equal(a, b) ? ["i32.const", 1] : null,
   "i64.eq": (a, b) => equal(a, b) ? ["i32.const", 1] : null,
   "i32.ne": (a, b) => equal(a, b) ? ["i32.const", 0] : null,
@@ -4598,21 +4509,25 @@ var PEEPHOLE = {
     return null;
   },
   "i32.and": (a, b) => {
+    if (equal(a, b)) return a;
     const ca = getConst(a), cb = getConst(b);
     if (ca?.value === 0 || cb?.value === 0) return ["i32.const", 0];
     return null;
   },
   "i64.and": (a, b) => {
+    if (equal(a, b)) return a;
     const ca = getConst(a), cb = getConst(b);
     if (ca?.value === 0n || cb?.value === 0n) return ["i64.const", 0n];
     return null;
   },
   "i32.or": (a, b) => {
+    if (equal(a, b)) return a;
     const ca = getConst(a), cb = getConst(b);
     if (ca?.value === -1 || cb?.value === -1) return ["i32.const", -1];
     return null;
   },
   "i64.or": (a, b) => {
+    if (equal(a, b)) return a;
     const ca = getConst(a), cb = getConst(b);
     if (ca?.value === -1n || cb?.value === -1n) return ["i64.const", -1n];
     return null;
@@ -4621,7 +4536,7 @@ var PEEPHOLE = {
   "local.set": (a, b) => Array.isArray(b) && b[0] === "local.get" && b[1] === a ? ["nop"] : null
 };
 var peephole = (ast) => {
-  return walkPost2(ast, (node) => {
+  return walkPost(ast, (node) => {
     if (!Array.isArray(node) || node.length !== 3) return;
     const fn = PEEPHOLE[node[0]];
     if (!fn) return;
@@ -4678,7 +4593,7 @@ var globals = (ast) => {
   }
   if (constGlobals.size === 0) return ast;
   const reads = /* @__PURE__ */ new Map();
-  walk2(ast, (n) => {
+  walk(ast, (n) => {
     if (!Array.isArray(n)) return;
     const ref = n[1];
     if (typeof ref !== "string" || ref[0] !== "$") return;
@@ -4696,9 +4611,9 @@ var globals = (ast) => {
     if (after <= before) propagate2.add(name2);
   }
   if (propagate2.size === 0) return ast;
-  walkPost2(ast, (node) => {
+  walkPost(ast, (node) => {
     if (!Array.isArray(node) || node[0] !== "global.get" || node.length !== 2) return;
-    if (propagate2.has(node[1])) return clone2(constGlobals.get(node[1]));
+    if (propagate2.has(node[1])) return clone(constGlobals.get(node[1]));
   });
   for (let i = ast.length - 1; i >= 1; i--) {
     const n = ast[i];
@@ -4707,7 +4622,7 @@ var globals = (ast) => {
   return ast;
 };
 var offset = (ast) => {
-  return walkPost2(ast, (node) => {
+  return walkPost(ast, (node) => {
     if (!Array.isArray(node)) return;
     const op = node[0];
     if (typeof op !== "string" || !op.endsWith("load") && !op.endsWith("store")) return;
@@ -4758,7 +4673,7 @@ var offset = (ast) => {
   });
 };
 var unbranch = (ast) => {
-  walk2(ast, (node) => {
+  walk(ast, (node) => {
     if (!Array.isArray(node)) return;
     const op = node[0];
     if (op !== "block") return;
@@ -4790,7 +4705,7 @@ var unbranch = (ast) => {
   return ast;
 };
 var loopify = (ast) => {
-  walk2(ast, (node) => {
+  walk(ast, (node) => {
     if (!Array.isArray(node) || node[0] !== "block") return;
     let bi = 1, label = null;
     if (typeof node[1] === "string" && node[1][0] === "$") {
@@ -4849,10 +4764,10 @@ var loopify = (ast) => {
 var stripmut = (ast) => {
   if (!Array.isArray(ast) || ast[0] !== "module") return ast;
   const written = /* @__PURE__ */ new Set();
-  walk2(ast, (n) => {
+  walk(ast, (n) => {
     if (Array.isArray(n) && n[0] === "global.set" && typeof n[1] === "string") written.add(n[1]);
   });
-  return walkPost2(ast, (node) => {
+  return walkPost(ast, (node) => {
     if (!Array.isArray(node) || node[0] !== "global") return;
     const name2 = typeof node[1] === "string" && node[1][0] === "$" ? node[1] : null;
     if (!name2 || written.has(name2)) return;
@@ -4866,7 +4781,7 @@ var stripmut = (ast) => {
   });
 };
 var brif = (ast) => {
-  return walkPost2(ast, (node) => {
+  return walkPost(ast, (node) => {
     if (!Array.isArray(node) || node[0] !== "if") return;
     const { cond, thenBranch, elseBranch } = parseIf(node);
     const thenEmpty = !thenBranch || thenBranch.length <= 1;
@@ -4882,7 +4797,7 @@ var brif = (ast) => {
   });
 };
 var foldarms = (ast) => {
-  return walkPost2(ast, (node) => {
+  return walkPost(ast, (node) => {
     if (!Array.isArray(node) || node[0] !== "if") return;
     const { thenBranch, elseBranch } = parseIf(node);
     if (!thenBranch || !elseBranch) return;
@@ -4955,7 +4870,7 @@ var dedupe = (ast) => {
     if (!name2) continue;
     const localNames = /* @__PURE__ */ new Set();
     if (typeof node[1] === "string" && node[1][0] === "$") localNames.add(node[1]);
-    walk2(node, (n) => {
+    walk(node, (n) => {
       if (!Array.isArray(n) || typeof n[1] !== "string" || n[1][0] !== "$") return;
       const op = n[0];
       if (op === "param" || op === "local" || op === "block" || op === "loop" || op === "if") {
@@ -4970,7 +4885,7 @@ var dedupe = (ast) => {
     }
   }
   if (redirects.size === 0) return ast;
-  walkPost2(ast, (node) => {
+  walkPost(ast, (node) => {
     if (!Array.isArray(node)) return;
     const op = node[0];
     if ((op === "call" || op === "return_call") && redirects.has(node[1])) {
@@ -5017,7 +4932,7 @@ var dedupTypes = (ast) => {
       if (name2 && redirects.has(name2)) ast.splice(i, 1);
     }
   }
-  walkPost2(ast, (node) => {
+  walkPost(ast, (node) => {
     if (!Array.isArray(node)) return;
     const op = node[0];
     if (op === "func") {
@@ -5244,7 +5159,7 @@ var minifyImports = (ast) => {
 };
 var reorderSafe = (ast) => {
   let safe = true;
-  walk2(ast, (n) => {
+  walk(ast, (n) => {
     if (!safe || !Array.isArray(n)) return;
     const op = n[0];
     if (op === "func" && (typeof n[1] !== "string" || n[1][0] !== "$")) safe = false;
@@ -5269,7 +5184,7 @@ var reorder = (ast) => {
   if (!Array.isArray(ast) || ast[0] !== "module") return ast;
   if (!reorderSafe(ast)) return ast;
   const callCounts = /* @__PURE__ */ new Map();
-  walk2(ast, (n) => {
+  walk(ast, (n) => {
     if (!Array.isArray(n)) return;
     if (n[0] === "call" || n[0] === "return_call") {
       callCounts.set(n[1], (callCounts.get(n[1]) || 0) + 1);
@@ -5288,6 +5203,47 @@ var reorder = (ast) => {
   funcs.sort((a, b) => (callCounts.get(b[1]) || 0) - (callCounts.get(a[1]) || 0));
   return ["module", ...imports, ...funcs, ...others];
 };
+var PASSES = [
+  ["stripmut", stripmut, true, "strip mut from never-written globals"],
+  ["globals", globals, true, "propagate immutable global constants"],
+  ["fold", fold, true, "constant folding"],
+  ["identity", identity, true, "remove identity ops (x + 0 \u2192 x)"],
+  ["peephole", peephole, true, "x-x\u21920, x&0\u21920, etc."],
+  ["strength", strength, true, "strength reduction (x * 2 \u2192 x << 1)"],
+  ["branch", branch, true, "simplify constant branches"],
+  ["propagate", propagate, true, "forward-propagate single-use locals & tiny consts (never inflates)"],
+  ["inlineOnce", inlineOnce, true, "inline single-call functions into their lone caller (never duplicates)"],
+  ["inline", inline, false, "inline tiny functions \u2014 can duplicate bodies"],
+  ["offset", offset, true, "fold add+const into load/store offset"],
+  ["unbranch", unbranch, true, "remove redundant br at end of own block"],
+  ["loopify", loopify, true, "collapse block+loop+brif while-idiom into loop+if"],
+  ["brif", brif, true, "if-then-br \u2192 br_if"],
+  ["foldarms", foldarms, false, "merge identical trailing if arms \u2014 can add block wrapper"],
+  ["deadcode", deadcode, true, "eliminate dead code after unreachable/br/return"],
+  ["vacuum", vacuum, true, "remove nops, drop-of-pure, empty branches"],
+  ["mergeBlocks", mergeBlocks, true, "unwrap `(block $L \u2026)` whose label is never targeted"],
+  ["coalesce", coalesceLocals, true, "share local slots between same-type non-overlapping locals"],
+  ["locals", localReuse, true, "remove unused locals"],
+  ["dedupe", dedupe, true, "eliminate duplicate functions"],
+  ["dedupTypes", dedupTypes, true, "merge identical type definitions"],
+  ["packData", packData, true, "trim trailing zeros, merge adjacent data segments"],
+  ["reorder", reorder, false, "put hot functions first \u2014 no AST reduction"],
+  ["treeshake", treeshake, true, "remove unused funcs/globals/types/tables"],
+  ["minifyImports", minifyImports, false, "shorten import names \u2014 enable only when you control the host"]
+];
+var OPTS = Object.fromEntries(PASSES.map((p) => [p[0], p[2]]));
+var normalize3 = (opts) => {
+  if (opts === false) return {};
+  if (opts !== true && typeof opts !== "string") {
+    const m2 = { ...opts };
+    for (const p of PASSES) if (m2[p[0]] === void 0) m2[p[0]] = p[2];
+    return m2;
+  }
+  const set = typeof opts === "string" ? new Set(opts.split(/\s+/).filter(Boolean)) : null;
+  const m = {};
+  for (const p of PASSES) m[p[0]] = set ? set.has("all") || set.has(p[0]) : p[2];
+  return m;
+};
 function optimize(ast, opts = true) {
   if (typeof ast === "string") ast = parse_default(ast);
   const strictGuard = opts === true;
@@ -5295,37 +5251,12 @@ function optimize(ast, opts = true) {
   const log = opts.log ? (msg, delta) => opts.log(msg, delta) : () => {
   };
   const verbose = opts.verbose || opts.log;
-  ast = clone2(ast);
+  ast = clone(ast);
   let beforeRound = null;
   for (let round = 0; round < 3; round++) {
-    beforeRound = clone2(ast);
+    beforeRound = clone(ast);
     const sizeBefore = binarySize(ast);
-    if (opts.stripmut) ast = stripmut(ast);
-    if (opts.globals) ast = globals(ast);
-    if (opts.fold) ast = fold(ast);
-    if (opts.identity) ast = identity(ast);
-    if (opts.peephole) ast = peephole(ast);
-    if (opts.strength) ast = strength(ast);
-    if (opts.branch) ast = branch(ast);
-    if (opts.propagate) ast = propagate(ast);
-    if (opts.inlineOnce) ast = inlineOnce(ast);
-    if (opts.inline) ast = inline(ast);
-    if (opts.offset) ast = offset(ast);
-    if (opts.unbranch) ast = unbranch(ast);
-    if (opts.loopify) ast = loopify(ast);
-    if (opts.brif) ast = brif(ast);
-    if (opts.foldarms) ast = foldarms(ast);
-    if (opts.deadcode) ast = deadcode(ast);
-    if (opts.vacuum) ast = vacuum(ast);
-    if (opts.mergeBlocks) ast = mergeBlocks(ast);
-    if (opts.coalesce) ast = coalesceLocals(ast);
-    if (opts.locals) ast = localReuse(ast);
-    if (opts.dedupe) ast = dedupe(ast);
-    if (opts.dedupTypes) ast = dedupTypes(ast);
-    if (opts.packData) ast = packData(ast);
-    if (opts.reorder) ast = reorder(ast);
-    if (opts.treeshake) ast = treeshake(ast);
-    if (opts.minifyImports) ast = minifyImports(ast);
+    for (const [key, fn] of PASSES) if (opts[key]) ast = fn(ast);
     if (opts.propagate && (opts.inlineOnce || opts.inline)) ast = propagate(ast);
     const sizeAfter = binarySize(ast);
     const delta = sizeAfter - sizeBefore;
@@ -5343,32 +5274,25 @@ function optimize(ast, opts = true) {
   return ast;
 }
 
-// watr.js
+// src/template.js
 var PUA = "\uE000";
-var instrType = (op) => {
-  if (!op || typeof op !== "string") return null;
-  const prefix = op.split(".")[0];
-  if (/^[if](32|64)|v128/.test(prefix)) return prefix;
-  if (/\.(eq|ne|[lg][te]|eqz)/.test(op)) return "i32";
-  if (op === "memory.size" || op === "memory.grow") return "i32";
-  return null;
-};
 var exprType = (node, ctx = {}) => {
   if (!Array.isArray(node)) {
     if (typeof node === "string" && node[0] === "$" && ctx.locals?.[node]) return ctx.locals[node];
     return null;
   }
   const [op, ...args] = node;
-  if (instrType(op)) return instrType(op);
+  const rt = resultType(op);
+  if (rt) return rt;
   if (op === "local.get" && ctx.locals?.[args[0]]) return ctx.locals[args[0]];
   if (op === "call" && ctx.funcs?.[args[0]]) return ctx.funcs[args[0]].result?.[0];
   return null;
 };
-function walk3(node, fn) {
+function walk2(node, fn) {
   node = fn(node);
   if (Array.isArray(node)) {
     for (let i = 0; i < node.length; i++) {
-      let child = walk3(node[i], fn);
+      let child = walk2(node[i], fn);
       if (child?._splice) node.splice(i, 1, ...child), i += child.length - 1;
       else node[i] = child;
     }
@@ -5378,7 +5302,7 @@ function walk3(node, fn) {
 function inferImports(ast, funcs) {
   const imports = [];
   const importMap = /* @__PURE__ */ new Map();
-  walk3(ast, (node) => {
+  walk2(ast, (node) => {
     if (!Array.isArray(node)) return node;
     if (node[0] === "call" && typeof node[1] === "function") {
       const fn = node[1];
@@ -5405,7 +5329,8 @@ function genImports(imports) {
     ({ name: name2, params }) => ["import", '"env"', `"${name2.slice(1)}"`, ["func", name2, ...params.map((t) => ["param", t])]]
   );
 }
-function compile2(source, ...values) {
+function compile2(backend2, source, values) {
+  const { parse, compile: emit, optimize: optimize2, polyfill: polyfill2 } = backend2;
   let opts = {};
   if (!Array.isArray(source) && values.length && typeof values[values.length - 1] === "object" && values[values.length - 1] !== null && !values[values.length - 1].byteLength) {
     opts = values.pop();
@@ -5415,10 +5340,10 @@ function compile2(source, ...values) {
     for (let i = 0; i < values.length; i++) {
       src += PUA + source[i + 1];
     }
-    let ast = parse_default(src);
+    let ast = parse(src);
     const funcsToImport = [];
     let idx = 0;
-    ast = walk3(ast, (node) => {
+    ast = walk2(ast, (node) => {
       if (node === PUA) {
         const value = values[idx++];
         if (typeof value === "function") {
@@ -5426,13 +5351,14 @@ function compile2(source, ...values) {
           return value;
         }
         if (typeof value === "string" && (value[0] === "(" || /^\s*\(/.test(value))) {
-          const parsed = parse_default(value);
+          const parsed = parse(value);
           if (Array.isArray(parsed) && Array.isArray(parsed[0])) {
             parsed._splice = true;
           }
           return parsed;
         }
-        if (value.byteLength !== void 0) return [...value];
+        if (value?.byteLength !== void 0) return [...value];
+        if (typeof value === "bigint") return value.toString();
         return value;
       }
       return node;
@@ -5455,33 +5381,42 @@ function compile2(source, ...values) {
         }
       }
     }
-    if (opts.polyfill) ast = polyfill(ast, opts.polyfill);
-    if (opts.optimize) ast = optimize(ast, opts.optimize);
-    const binary = compile(ast);
+    if (opts.polyfill) ast = polyfill2(ast, opts.polyfill);
+    if (opts.optimize) ast = optimize2(ast, opts.optimize);
+    const binary = emit(ast);
     if (importObjs) binary._imports = importObjs;
     return binary;
   }
   if (opts.polyfill || opts.optimize) {
-    let ast = typeof source === "string" ? parse_default(source) : source;
-    if (opts.polyfill) ast = polyfill(ast, opts.polyfill);
-    if (opts.optimize) ast = optimize(ast, opts.optimize);
-    return compile(ast);
+    let ast = typeof source === "string" ? parse(source) : source;
+    if (opts.polyfill) ast = polyfill2(ast, opts.polyfill);
+    if (opts.optimize) ast = optimize2(ast, opts.optimize);
+    return emit(ast);
   }
-  return compile(source);
+  return emit(source);
 }
-function watr(strings, ...values) {
-  const binary = compile2(strings, ...values);
+function watr(backend2, source, values) {
+  const binary = compile2(backend2, source, values);
   const module = new WebAssembly.Module(binary);
   const instance = new WebAssembly.Instance(module, binary._imports);
   return instance.exports;
 }
-var watr_default = watr;
+
+// watr.js
+var backend = { parse: parse_default, compile, optimize, polyfill };
+function compile3(source, ...values) {
+  return compile2(backend, source, values);
+}
+function watr2(source, ...values) {
+  return watr(backend, source, values);
+}
+var watr_default = watr2;
 export {
-  compile2 as compile,
+  compile3 as compile,
   watr_default as default,
   optimize,
   parse_default as parse,
   polyfill,
   print,
-  watr
+  watr2 as watr
 };