watr 1.3.2 → 1.4.1

package/package.json

@@ -1,21 +1,18 @@
 {
   "name": "watr",
-  "version": "1.3.2",
+  "version": "1.4.1",
   "description": "Ligth & fast WAT compiler",
   "main": "watr.js",
   "type": "module",
   "scripts": {
-    "test": "node test",
-    "build": "rollup src/watr.js --file watr.js --format esm --name \"Watr\"",
-    "min": "terser watr.js -o watr.min.js --module -c passes=3 -m"
+    "test": "node test"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/audio-lab/watr.git"
   },
   "files": [
-    "watr.js",
-    "watr.min.js"
+    "src"
   ],
   "keywords": [
     "wat",
@@ -29,8 +26,6 @@
   },
   "homepage": "https://github.com/audio-lab/watr#readme",
   "devDependencies": {
-    "rollup": "^2.70.1",
-    "terser": "^5.12.1",
     "tst": "^7.1.1",
     "wabt": "^1.0.28",
     "wat-compiler": "^1.0.0"

package/readme.md

@@ -88,25 +88,23 @@ const tree = [
   ['f64.mul', ['local.get', 0], ['f64.const', 2]]
 ]
 
-// minify (default)
+// pretty-print (default)
 const str = print(tree, {
-  indent: false,
-  newline: false,
-  pad: false
-})
-// (func (export "double")(param f64)(result f64)(f64.mul (local.get 0)(f64.const 2)))
-
-// pretty-print
-const str = print(tree, {
-  indent: '  ',   // indentation step
-  newline: '\n',  // new line
-  pad: '',        // pad each newline with chars
+  indent: '  ',   // indentation chars
+  newline: '\n',  // new line chars
 })
 // (func (export "double")
 //   (param f64) (result f64)
 //     (f64.mul
 //       (local.get 0)
 //       (f64.const 2)))
+
+// minify
+const str = print(tree, {
+  indent: false,
+  newline: false
+})
+// (func (export "double")(param f64)(result f64)(f64.mul (local.get 0)(f64.const 2)))
 ```
 
 <!--

package/src/compile.js

@@ -0,0 +1,398 @@
+import { uleb, leb, bigleb, f64, f32 } from './util.js'
+import { OP, SECTION, ALIGN, TYPE, KIND } from './const.js'
+import parse from './parse.js'
+
+// some inlinable instructions
+const INLINE = { loop: 1, block: 1, if: 1, end: -1, return: -1 }
+
+// convert wat tree to wasm binary
+export default (nodes) => {
+  if (typeof nodes === 'string') nodes = parse(nodes);
+
+  // IR. Alias is stored directly to section array by key, eg. section.func.$name = idx
+  let sections = {
+    type: [], import: [], func: [], table: [], memory: [], global: [], export: [], start: [], elem: [], code: [], data: []
+  }, binary = [
+    0x00, 0x61, 0x73, 0x6d, // magic
+    0x01, 0x00, 0x00, 0x00, // version
+  ]
+
+  // 1. transform tree
+  // (func) → [(func)]
+  if (typeof nodes[0] === 'string' && nodes[0] !== 'module') nodes = [nodes]
+
+  // (global $a (import "a" "b") (mut i32)) → (import "a" "b" (global $a (mut i32)))
+  // (memory (import "a" "b") min max shared) → (import "a" "b" (memory min max shared))
+  nodes = nodes.map(node => {
+    if (node[2]?.[0] === 'import') {
+      let [kind, name, imp, ...args] = node
+      return [...imp, [kind, name, ...args]]
+    }
+    else if (node[1]?.[0] === 'import') {
+      let [kind, imp, ...args] = node
+      return [...imp, [kind, ...args]]
+    }
+    return node
+  })
+
+  // 2. build IR. import must be initialized first, global before func, elem after func
+  let order = ['type', 'import', 'table', 'memory', 'global', 'func', 'export', 'start', 'elem', 'data'], postcall = []
+
+  for (let name of order) {
+    let remaining = []
+    for (let node of nodes) {
+      node[0] === name ? postcall.push(build[name](node, sections)) : remaining.push(node)
+    }
+
+    nodes = remaining
+  }
+
+  // code must be compiled after all definitions
+  for (let cb of postcall) cb && cb.call && cb()
+
+
+  // 3. build binary
+  for (let name in sections) {
+    let items = sections[name]
+    if (items.importc) items = items.slice(items.importc) // discard imported functions/globals
+    if (!items.length) continue
+    let sectionCode = SECTION[name], bytes = []
+    if (sectionCode !== 8) bytes.push(items.length) // skip start section count
+    for (let item of items) bytes.push(...item)
+    binary.push(sectionCode, ...uleb(bytes.length), ...bytes)
+  }
+
+  return new Uint8Array(binary)
+}
+
+const build = {
+  // (type $name? (func (param $x i32) (param i64 i32) (result i32 i64)))
+  // signature part is identical to function
+  // FIXME: handle non-function types
+  type([, typeName, decl], ctx) {
+    if (typeName[0] !== '$') decl = typeName, typeName = null
+    let params = [], result = [], [kind, ...sig] = decl, idx, bytes
+
+    if (kind === 'func') {
+      // collect params
+      while (sig[0]?.[0] === 'param') {
+        let [, ...types] = sig.shift()
+        if (types[0]?.[0] === '$') params[types.shift()] = params.length
+        params.push(...types.map(t => TYPE[t]))
+      }
+
+      // collect result type
+      if (sig[0]?.[0] === 'result') result = sig.shift().slice(1).map(t => TYPE[t])
+
+      // reuse existing type or register new one
+      bytes = [TYPE.func, ...uleb(params.length), ...params, ...uleb(result.length), ...result]
+
+      idx = ctx.type.findIndex((prevType) => prevType.every((byte, i) => byte === bytes[i]))
+      if (idx < 0) idx = ctx.type.push(bytes) - 1
+    }
+
+    if (typeName) ctx.type[typeName] = idx
+
+    return [idx, params, result]
+  },
+
+  // (func $name? ...params result ...body)
+  func([, ...body], ctx) {
+    let locals = [], // list of local variables
+      callstack = []
+
+    // fn name
+    if (body[0]?.[0] === '$') ctx.func[body.shift()] = ctx.func.length
+
+    // export binding
+    if (body[0]?.[0] === 'export') build.export([...body.shift(), ['func', ctx.func.length]], ctx)
+
+    // register type
+    let [typeIdx, params, result] = build.type([, ['func', ...body]], ctx)
+    // FIXME: try merging with build.type: it should be able to consume body
+    while (body[0]?.[0] === 'param' || body[0]?.[0] === 'result') body.shift()
+    ctx.func.push([typeIdx])
+
+    // collect locals
+    while (body[0]?.[0] === 'local') {
+      let [, ...types] = body.shift(), name
+      if (types[0][0] === '$')
+        params[name = types.shift()] ? err('Ambiguous name ' + name) :
+          locals[name] = params.length + locals.length
+      locals.push(...types.map(t => TYPE[t]))
+    }
+
+    // squash local types
+    let locTypes = locals.reduce((a, type) => (type == a[a.length - 1] ? a[a.length - 2]++ : a.push(1, type), a), [])
+
+    // map code instruction into bytes: [args, opCode, immediates]
+    const instr = (group) => {
+      let [op, ...nodes] = group
+      let opCode = OP[op], argc = 0, before = [], after = [], id
+
+      // NOTE: we could reorganize ops by groups and detect signature as `op in STORE`
+      // but numeric comparison is faster than generic hash lookup
+      // FIXME: we often use OP.end or alike: what if we had list of global constants?
+
+      // binary/unary
+      if (opCode >= 69) {
+        argc = opCode >= 167 ||
+          (opCode <= 159 && opCode >= 153) ||
+          (opCode <= 145 && opCode >= 139) ||
+          (opCode <= 123 && opCode >= 121) ||
+          (opCode <= 105 && opCode >= 103) ||
+          opCode == 80 || opCode == 69 ? 1 : 2
+      }
+      // instruction
+      else {
+        // (i32.store align=n offset=m at value)
+        if (opCode >= 40 && opCode <= 62) {
+          // FIXME: figure out point in Math.log2 aligns
+          let o = { align: ALIGN[op], offset: 0 }, p
+          while (nodes[0]?.includes('=')) p = nodes.shift().split('='), o[p[0]] = Number(p[1])
+          after = [Math.log2(o.align), ...uleb(o.offset)]
+          argc = opCode >= 54 ? 2 : 1
+        }
+
+        // (i32.const 123)
+        else if (opCode >= 65 && opCode <= 68) {
+          after = (opCode == 65 ? leb : opCode == 66 ? bigleb : opCode == 67 ? f32 : f64)(nodes.shift())
+        }
+
+        // (local.get $id), (local.tee $id x)
+        else if (opCode >= 32 && opCode <= 34) {
+          after = uleb(nodes[0]?.[0] === '$' ? params[id = nodes.shift()] || locals[id] : nodes.shift())
+          if (opCode > 32) argc = 1
+        }
+
+        // (global.get id), (global.set id)
+        else if (opCode == 35 || opCode == 36) {
+          after = uleb(nodes[0]?.[0] === '$' ? ctx.global[nodes.shift()] : nodes.shift())
+          if (opCode > 35) argc = 1
+        }
+
+        // (call id ...nodes)
+        else if (opCode == 16) {
+          let fnName = nodes.shift()
+          after = uleb(id = fnName[0] === '$' ? ctx.func[fnName] ?? err('Unknown function `' + fnName + '`') : fnName);
+          // FIXME: how to get signature of imported function
+          [, argc] = ctx.type[ctx.func[id][0]]
+        }
+
+        // (call_indirect (type $typeName) (idx) ...nodes)
+        else if (opCode == 17) {
+          let typeId = nodes.shift()[1];
+          [, argc] = ctx.type[typeId = typeId[0] === '$' ? ctx.type[typeId] : typeId]
+          argc++
+          after = uleb(typeId), after.push(0) // extra afterediate indicates table idx (reserved)
+        }
+
+        // FIXME (memory.grow $idx?)
+        else if (opCode == 63 || opCode == 64) {
+          after = [0]
+          argc = 1
+        }
+
+        // (if (result i32)? (local.get 0) (then a b) (else a b)?)
+        else if (opCode == 4) {
+          callstack.push(opCode)
+          let [, type] = nodes[0][0] === 'result' ? nodes.shift() : [, 'void']
+          after = [TYPE[type]]
+
+          argc = 0, before.push(...instr(nodes.shift()))
+          let body
+          if (nodes[0]?.[0] === 'then') [, ...body] = nodes.shift(); else body = nodes
+          after.push(...consume(body))
+
+          callstack.pop(), callstack.push(OP.else)
+          if (nodes[0]?.[0] === 'else') {
+            [, ...body] = nodes.shift()
+            if (body.length) after.push(OP.else, ...consume(body))
+          }
+          callstack.pop()
+          after.push(OP.end)
+        }
+
+        // (drop arg?), (return arg?)
+        else if (opCode == 0x1a || opCode == 0x0f) { argc = nodes.length ? 1 : 0 }
+
+        // (select a b cond)
+        else if (opCode == 0x1b) { argc = 3 }
+
+        // (block ...), (loop ...)
+        else if (opCode == 2 || opCode == 3) {
+          callstack.push(opCode)
+          if (nodes[0]?.[0] === '$') (callstack[nodes.shift()] = callstack.length)
+          let [, type] = nodes[0]?.[0] === 'result' ? nodes.shift() : [, 'void']
+          after = [TYPE[type], ...consume(nodes)]
+
+          if (!group.inline) callstack.pop(), after.push(OP.end) // inline loop/block expects end to be separately provided
+        }
+
+        // (end)
+        else if (opCode == 0x0b) callstack.pop()
+
+        // (br $label result?)
+        // (br_if $label cond result?)
+        else if (opCode == 0x0c || opCode == 0x0d) {
+          // br index indicates how many callstack items to pop
+          after = uleb(nodes[0]?.[0] === '$' ? callstack.length - callstack[nodes.shift()] : nodes.shift())
+          argc = (opCode == 0x0d ? 1 + (nodes.length > 1) : !!nodes.length)
+        }
+
+        // (br_table 1 2 3 4  0  selector result?)
+        else if (opCode == 0x0e) {
+          after = []
+          while (!Array.isArray(nodes[0])) id = nodes.shift(), after.push(...uleb(id[0][0] === '$' ? callstack.length - callstack[id] : id))
+          after.unshift(...uleb(after.length - 1))
+          argc = 1 + (nodes.length > 1)
+        }
+
+        else if (opCode == null) err(`Unknown instruction \`${op}\``)
+      }
+
+      // consume arguments
+      if (nodes.length < argc) err(`Stack arguments are not supported at \`${op}\``)
+      while (argc--) before.push(...instr(nodes.shift()))
+      if (nodes.length) err(`Too many arguments for \`${op}\`.`)
+
+      return [...before, opCode, ...after]
+    }
+
+    // consume sequence of nodes
+    const consume = nodes => {
+      let result = []
+      while (nodes.length) {
+        let node = nodes.shift(), c
+
+        if (typeof node === 'string') {
+          // permit some inline instructions: loop $label ... end,  br $label,  arg return
+          if (c = INLINE[node]) {
+            node = [node], node.inline = true
+            if (c > 0) nodes[0]?.[0] === '$' && node.push(nodes.shift())
+          }
+          else err(`Inline instruction \`${node}\` is not supported`)
+        }
+
+        node && result.push(...instr(node))
+      }
+      return result
+    }
+
+    // evaluates after all definitions
+    return () => {
+      let code = consume(body)
+      ctx.code.push([...uleb(code.length + 2 + locTypes.length), ...uleb(locTypes.length >> 1), ...locTypes, ...code, OP.end])
+    }
+  },
+
+  // (memory min max shared)
+  // (memory $name min max shared)
+  // (memory (export "mem") 5)
+  memory([, ...parts], ctx) {
+    if (parts[0][0] === '$') ctx.memory[parts.shift()] = ctx.memory.length
+    if (parts[0][0] === 'export') build.export([...parts.shift(), ['memory', ctx.memory.length]], ctx)
+    ctx.memory.push(range(parts))
+  },
+
+  // (global i32 (i32.const 42))
+  // (global $id i32 (i32.const 42))
+  // (global $id (mut i32) (i32.const 42))
+  global([, ...args], ctx) {
+    let name = args[0][0] === '$' && args.shift()
+    if (name) ctx.global[name] = ctx.global.length
+    let [type, init] = args, mut = type[0] === 'mut' ? 1 : 0
+    ctx.global.push([TYPE[mut ? type[1] : type], mut, ...iinit(init)])
+  },
+
+  // (table 1 2? funcref)
+  // (table $name 1 2? funcref)
+  table([, ...args], ctx) {
+    let name = args[0][0] === '$' && args.shift()
+    if (name) ctx.table[name] = ctx.table.length
+    let lims = range(args)
+    ctx.table.push([TYPE[args.pop()], ...lims])
+  },
+
+  // (elem (i32.const 0) $f1 $f2), (elem (global.get 0) $f1 $f2)
+  elem([, offset, ...elems], ctx) {
+    const tableIdx = 0 // FIXME: table index can be defined
+    ctx.elem.push([tableIdx, ...iinit(offset, ctx), ...uleb(elems.length), ...elems.flatMap(el => uleb(el[0] === '$' ? ctx.func[el] : el))])
+  },
+
+  //  (export "name" (kind $name|idx))
+  export([, name, [kind, idx]], ctx) {
+    if (idx[0] === '$') idx = ctx[kind][idx]
+    ctx.export.push([...str(name), KIND[kind], ...uleb(idx)])
+  },
+
+  // (import "math" "add" (func $add (param i32 i32 externref) (result i32)))
+  // (import "js" "mem" (memory 1))
+  // (import "js" "mem" (memory $name 1))
+  // (import "js" "v" (global $name (mut f64)))
+  import([, mod, field, ref], ctx) {
+    let details, [kind, ...parts] = ref,
+      name = parts[0]?.[0] === '$' && parts.shift();
+
+    if (kind === 'func') {
+      // we track imported funcs in func section to share namespace, and skip them on final build
+      if (name) ctx.func[name] = ctx.func.length
+      let [typeIdx] = build.type([, ['func', ...parts]], ctx)
+      ctx.func.push(details = uleb(typeIdx))
+      ctx.func.importc = (ctx.func.importc || 0) + 1
+    }
+    else if (kind === 'memory') {
+      if (name) ctx.memory[name] = ctx.memory.length
+      details = range(parts)
+    }
+    else if (kind === 'global') {
+      // imported globals share namespace with internal globals - we skip them in final build
+      if (name) ctx.global[name] = ctx.global.length
+      let [type] = parts, mut = type[0] === 'mut' ? 1 : 0
+      details = [TYPE[mut ? type[1] : type], mut]
+      ctx.global.push(details)
+      ctx.global.importc = (ctx.global.importc || 0) + 1
+    }
+    else throw Error('Unimplemented ' + kind)
+
+    ctx.import.push([...str(mod), ...str(field), KIND[kind], ...details])
+  },
+
+  // (data (i32.const 0) "\aa" "\bb"?)
+  data([, offset, ...inits], ctx) {
+    // FIXME: first is mem index
+    ctx.data.push([0, ...iinit(offset, ctx), ...str(inits.map(i => i[0] === '"' ? i.slice(1, -1) : i).join(''))])
+  },
+
+  // (start $main)
+  start([, name], ctx) {
+    if (!ctx.start.length) ctx.start.push([name[0] === '$' ? ctx.func[name] : name])
+  }
+}
+
+// (i32.const 0) - instantiation time initializer
+const iinit = ([op, literal], ctx) => op[0] === 'f' ?
+  [OP[op], ...(op[1] === '3' ? f32 : f64)(literal), OP.end] :
+  [OP[op], ...(op[1] === '3' ? leb : bigleb)(literal[0] === '$' ? ctx.global[literal] : literal), OP.end]
+
+const escape = { n: 10, r: 13, t: 9, v: 1 }
+
+// build string binary
+const str = str => {
+  str = str[0] === '"' ? str.slice(1, -1) : str
+  let res = [], i = 0, c, BSLASH = 92
+  // spec https://webassembly.github.io/spec/core/text/values.html#strings
+  for (; i < str.length;) {
+    c = str.charCodeAt(i++)
+    res.push(c === BSLASH ? escape[str[i++]] || parseInt(str.slice(i - 1, ++i), 16) : c)
+  }
+
+  res.unshift(...uleb(res.length))
+  return res
+}
+
+
+// build range/limits sequence (non-consuming)
+const range = ([min, max, shared]) => isNaN(parseInt(max)) ? [0, ...uleb(min)] : [shared === 'shared' ? 3 : 1, ...uleb(min), ...uleb(max)]
+
+const err = text => { throw Error(text) }

package/src/const.js

@@ -0,0 +1,41 @@
+// ref: https://github.com/stagas/wat-compiler/blob/main/lib/const.js
+// NOTE: squashing into a string doesn't save up gzipped size
+export const OP = [
+  'unreachable', 'nop', 'block', 'loop', 'if', 'else', ,,,,,
+  'end', 'br', 'br_if', 'br_table', 'return', 'call', 'call_indirect', ,,,,,,,,
+  'drop', 'select', ,,,,
+  'local.get', 'local.set', 'local.tee', 'global.get', 'global.set', ,,,
+  'i32.load', 'i64.load', 'f32.load', 'f64.load',
+  'i32.load8_s', 'i32.load8_u', 'i32.load16_s', 'i32.load16_u',
+  'i64.load8_s', 'i64.load8_u', 'i64.load16_s', 'i64.load16_u', 'i64.load32_s', 'i64.load32_u',
+  'i32.store', 'i64.store', 'f32.store', 'f64.store',
+  'i32.store8', 'i32.store16', 'i64.store8', 'i64.store16', 'i64.store32',
+  'memory.size', 'memory.grow',
+  'i32.const', 'i64.const', 'f32.const', 'f64.const',
+  'i32.eqz', 'i32.eq', 'i32.ne', 'i32.lt_s', 'i32.lt_u', 'i32.gt_s', 'i32.gt_u', 'i32.le_s', 'i32.le_u', 'i32.ge_s', 'i32.ge_u',
+  'i64.eqz', 'i64.eq', 'i64.ne', 'i64.lt_s', 'i64.lt_u', 'i64.gt_s', 'i64.gt_u', 'i64.le_s', 'i64.le_u', 'i64.ge_s', 'i64.ge_u',
+             'f32.eq', 'f32.ne', 'f32.lt',               'f32.gt',               'f32.le',               'f32.ge',
+             'f64.eq', 'f64.ne', 'f64.lt',               'f64.gt',               'f64.le',               'f64.ge',
+  'i32.clz', 'i32.ctz', 'i32.popcnt', 'i32.add', 'i32.sub', 'i32.mul', 'i32.div_s', 'i32.div_u', 'i32.rem_s', 'i32.rem_u', 'i32.and', 'i32.or', 'i32.xor', 'i32.shl', 'i32.shr_s', 'i32.shr_u', 'i32.rotl', 'i32.rotr',
+  'i64.clz', 'i64.ctz', 'i64.popcnt', 'i64.add', 'i64.sub', 'i64.mul', 'i64.div_s', 'i64.div_u', 'i64.rem_s', 'i64.rem_u', 'i64.and', 'i64.or', 'i64.xor', 'i64.shl', 'i64.shr_s', 'i64.shr_u', 'i64.rotl', 'i64.rotr',
+  'f32.abs', 'f32.neg', 'f32.ceil', 'f32.floor', 'f32.trunc', 'f32.nearest', 'f32.sqrt', 'f32.add', 'f32.sub', 'f32.mul', 'f32.div', 'f32.min', 'f32.max', 'f32.copysign',
+  'f64.abs', 'f64.neg', 'f64.ceil', 'f64.floor', 'f64.trunc', 'f64.nearest', 'f64.sqrt', 'f64.add', 'f64.sub', 'f64.mul', 'f64.div', 'f64.min', 'f64.max', 'f64.copysign',
+  'i32.wrap_i64',
+  'i32.trunc_f32_s', 'i32.trunc_f32_u', 'i32.trunc_f64_s', 'i32.trunc_f64_u', 'i64.extend_i32_s', 'i64.extend_i32_u',
+  'i64.trunc_f32_s', 'i64.trunc_f32_u', 'i64.trunc_f64_s', 'i64.trunc_f64_u',
+  'f32.convert_i32_s', 'f32.convert_i32_u', 'f32.convert_i64_s', 'f32.convert_i64_u', 'f32.demote_f64',
+  'f64.convert_i32_s', 'f64.convert_i32_u', 'f64.convert_i64_s', 'f64.convert_i64_u', 'f64.promote_f32',
+  'i32.reinterpret_f32', 'i64.reinterpret_f64', 'f32.reinterpret_i32', 'f64.reinterpret_i64',
+],
+SECTION = { type:1, import:2, func:3, table:4, memory:5, global:6, export:7, start:8, elem:9, code:10, data:11 },
+TYPE = { i32:0x7f, i64:0x7e, f32:0x7d, f64:0x7c, void:0x40, func:0x60, funcref:0x70 },
+KIND = { func: 0, table: 1, memory: 2, global: 3 },
+ALIGN = {
+  'i32.load': 4, 'i64.load': 8, 'f32.load': 4, 'f64.load': 8,
+  'i32.load8_s': 1, 'i32.load8_u': 1, 'i32.load16_s': 2, 'i32.load16_u': 2,
+  'i64.load8_s': 1, 'i64.load8_u': 1, 'i64.load16_s': 2, 'i64.load16_u': 2, 'i64.load32_s': 4, 'i64.load32_u': 4,  'i32.store': 4,
+  'i64.store': 8, 'f32.store': 4, 'f64.store': 8,
+  'i32.store8': 1, 'i32.store16': 2, 'i64.store8': 1, 'i64.store16': 2, 'i64.store32': 4,
+}
+
+OP.map((op,i)=>OP[op]=i) // init op names

package/src/parse.js

@@ -0,0 +1,32 @@
+const OPAREN = 40, CPAREN = 41, OBRACK = 91, CBRACK = 93, SPACE = 32, DQUOTE = 34, PERIOD = 46,
+  _0 = 48, _9 = 57, SEMIC = 59, NEWLINE = 32, PLUS = 43, MINUS = 45, COLON = 58
+
+export default (str) => {
+  let i = 0, level = [], buf = ''
+
+  const commit = () => buf && (
+    level.push(buf),
+    buf = ''
+  )
+
+  const parseLevel = () => {
+    for (let c, root; i < str.length;) {
+      c = str.charCodeAt(i)
+      if (c === DQUOTE) commit(), buf = str.slice(i++, i = str.indexOf('"', i) + 1), commit()
+      else if (c === OPAREN) {
+        if (str.charCodeAt(i + 1) === SEMIC) i = str.indexOf(';)', i) + 2 // (; ... ;)
+        else commit(), i++, (root = level).push(level = []), parseLevel(), level = root
+      }
+      else if (c === SEMIC) i = str.indexOf('\n', i) + 1  // ; ...
+      else if (c <= SPACE) commit(), i++
+      else if (c === CPAREN) return commit(), i++
+      else buf += str[i++]
+    }
+
+    commit()
+  }
+
+  parseLevel()
+
+  return level.length > 1 ? level : level[0]
+}

package/src/print.js

@@ -0,0 +1,59 @@
+import parse from './parse.js';
+
+let indent = '', newline = '\n'
+
+export default function print(tree, options = {}) {
+  if (typeof tree === 'string') tree = parse(tree);
+
+  ({ indent='  ', newline='\n' } = options);
+  indent ||= '', newline ||= '';
+
+  return typeof tree[0] === 'string' ? printNode(tree) : tree.map(node => printNode(node)).join(newline)
+}
+
+const INLINE = [
+  'param',
+  'drop',
+  'f32.const',
+  'f64.const',
+  'i32.const',
+  'i64.const',
+  'local.get',
+  'global.get',
+  'memory.size',
+  'result',
+  'export',
+  'unreachable',
+  'nop'
+]
+
+function printNode(node, level = 0) {
+  if (!Array.isArray(node)) return node + ''
+
+  let content = node[0]
+
+  for (let i = 1; i < node.length; i++) {
+    // new node doesn't need space separator, eg. [x,[y]] -> `x(y)`
+    if (Array.isArray(node[i])) {
+      // inline nodes like (param x)(param y)
+      // (func (export "xxx")..., but not (func (export "a")(param "b")...
+
+      if (
+        INLINE.includes(node[i][0]) &&
+        (!Array.isArray(node[i - 1]) || INLINE.includes(node[i - 1][0]))
+      ) {
+        if (!Array.isArray(node[i - 1])) content += ` `
+      } else {
+        content += newline
+        if (node[i]) content += indent.repeat(level + 1)
+      }
+
+      content += printNode(node[i], level + 1)
+    }
+    else {
+      content += ` `
+      content += node[i]
+    }
+  }
+  return `(${content})`
+}

package/src/util.js

@@ -0,0 +1,102 @@
+// encoding ref: https://github.com/j-s-n/WebBS/blob/master/compiler/byteCode.js
+export const uleb = (number, buffer=[]) => {
+  if (typeof number === 'string') number = parseInt(number.replaceAll('_',''))
+
+  let byte = number & 0b01111111;
+  number = number >>> 7;
+
+  if (number === 0) {
+    buffer.push(byte);
+    return buffer;
+  } else {
+    buffer.push(byte | 0b10000000);
+    return uleb(number, buffer);
+  }
+}
+
+export function leb (n, buffer=[]) {
+  if (typeof n === 'string') n = parseInt(n.replaceAll('_',''))
+
+  while (true) {
+    const byte = Number(n & 0x7F)
+    n >>= 7
+    if ((n === 0 && (byte & 0x40) === 0) || (n === -1 && (byte & 0x40) !== 0)) {
+      buffer.push(byte)
+      break
+    }
+    buffer.push((byte | 0x80))
+  }
+  return buffer
+}
+
+export function bigleb(n, buffer=[]) {
+  if (typeof n === 'string') {
+    n = n.replaceAll('_','')
+    n = n[0]==='-'?-BigInt(n.slice(1)):BigInt(n)
+    byteView.setBigInt64(0, n)
+    n = byteView.getBigInt64(0)
+  }
+
+  while (true) {
+    const byte = Number(n & 0x7Fn)
+    n >>= 7n
+    if ((n === 0n && (byte & 0x40) === 0) || (n === -1n && (byte & 0x40) !== 0)) {
+      buffer.push(byte)
+      break
+    }
+    buffer.push((byte | 0x80))
+  }
+  return buffer
+}
+
+// generalized float cases parser
+const flt = input => input==='nan'||input==='+nan'?NaN:input==='-nan'?-NaN:
+    input==='inf'||input==='+inf'?Infinity:input==='-inf'?-Infinity:parseFloat(input.replaceAll('_',''))
+
+const byteView = new DataView(new BigInt64Array(1).buffer)
+
+const F32_SIGN = 0x80000000, F32_NAN  = 0x7f800000
+export function f32 (input, value, idx) {
+  if (~(idx=input.indexOf('nan:'))) {
+    value = parseInt(input.slice(idx+4))
+    value |= F32_NAN
+    if (input[0] === '-') value |= F32_SIGN
+    byteView.setInt32(0, value)
+  }
+  else {
+    value=typeof input === 'string' ? flt(input) : input
+    byteView.setFloat32(0, value);
+  }
+
+  return [
+    byteView.getUint8(3),
+    byteView.getUint8(2),
+    byteView.getUint8(1),
+    byteView.getUint8(0)
+  ];
+}
+
+const F64_SIGN = 0x8000000000000000n, F64_NAN  = 0x7ff0000000000000n
+export function f64 (input, value, idx) {
+  if (~(idx=input.indexOf('nan:'))) {
+    value = BigInt(input.slice(idx+4))
+    value |= F64_NAN
+    if (input[0] === '-') value |= F64_SIGN
+    byteView.setBigInt64(0, value)
+  }
+  else {
+    value=typeof input === 'string' ? flt(input) : input
+    byteView.setFloat64(0, value);
+  }
+
+  return [
+    byteView.getUint8(7),
+    byteView.getUint8(6),
+    byteView.getUint8(5),
+    byteView.getUint8(4),
+    byteView.getUint8(3),
+    byteView.getUint8(2),
+    byteView.getUint8(1),
+    byteView.getUint8(0)
+  ];
+}

package/watr.js

@@ -1,620 +1,6 @@
-// encoding ref: https://github.com/j-s-n/WebBS/blob/master/compiler/byteCode.js
-const uleb = (number, buffer=[]) => {
-  if (typeof number === 'string') number = parseInt(number.replaceAll('_',''));
+import compile from './src/compile.js'
+import parse from './src/parse.js'
+import print from './src/print.js'
 
-  let byte = number & 0b01111111;
-  number = number >>> 7;
-
-  if (number === 0) {
-    buffer.push(byte);
-    return buffer;
-  } else {
-    buffer.push(byte | 0b10000000);
-    return uleb(number, buffer);
-  }
-};
-
-function leb (n, buffer=[]) {
-  if (typeof n === 'string') n = parseInt(n.replaceAll('_',''));
-
-  while (true) {
-    const byte = Number(n & 0x7F);
-    n >>= 7;
-    if ((n === 0 && (byte & 0x40) === 0) || (n === -1 && (byte & 0x40) !== 0)) {
-      buffer.push(byte);
-      break
-    }
-    buffer.push((byte | 0x80));
-  }
-  return buffer
-}
-
-function bigleb(n, buffer=[]) {
-  if (typeof n === 'string') {
-    n = n.replaceAll('_','');
-    n = n[0]==='-'?-BigInt(n.slice(1)):BigInt(n);
-    byteView.setBigInt64(0, n);
-    n = byteView.getBigInt64(0);
-  }
-
-  while (true) {
-    const byte = Number(n & 0x7Fn);
-    n >>= 7n;
-    if ((n === 0n && (byte & 0x40) === 0) || (n === -1n && (byte & 0x40) !== 0)) {
-      buffer.push(byte);
-      break
-    }
-    buffer.push((byte | 0x80));
-  }
-  return buffer
-}
-
-// generalized float cases parser
-const flt = input => input==='nan'||input==='+nan'?NaN:input==='-nan'?-NaN:
-    input==='inf'||input==='+inf'?Infinity:input==='-inf'?-Infinity:parseFloat(input.replaceAll('_',''));
-
-const byteView = new DataView(new BigInt64Array(1).buffer);
-
-const F32_SIGN = 0x80000000, F32_NAN  = 0x7f800000;
-function f32 (input, value, idx) {
-  if (~(idx=input.indexOf('nan:'))) {
-    value = parseInt(input.slice(idx+4));
-    value |= F32_NAN;
-    if (input[0] === '-') value |= F32_SIGN;
-    byteView.setInt32(0, value);
-  }
-  else {
-    value=typeof input === 'string' ? flt(input) : input;
-    byteView.setFloat32(0, value);
-  }
-
-  return [
-    byteView.getUint8(3),
-    byteView.getUint8(2),
-    byteView.getUint8(1),
-    byteView.getUint8(0)
-  ];
-}
-
-const F64_SIGN = 0x8000000000000000n, F64_NAN  = 0x7ff0000000000000n;
-function f64 (input, value, idx) {
-  if (~(idx=input.indexOf('nan:'))) {
-    value = BigInt(input.slice(idx+4));
-    value |= F64_NAN;
-    if (input[0] === '-') value |= F64_SIGN;
-    byteView.setBigInt64(0, value);
-  }
-  else {
-    value=typeof input === 'string' ? flt(input) : input;
-    byteView.setFloat64(0, value);
-  }
-
-  return [
-    byteView.getUint8(7),
-    byteView.getUint8(6),
-    byteView.getUint8(5),
-    byteView.getUint8(4),
-    byteView.getUint8(3),
-    byteView.getUint8(2),
-    byteView.getUint8(1),
-    byteView.getUint8(0)
-  ];
-}
-
-// ref: https://github.com/stagas/wat-compiler/blob/main/lib/const.js
-// NOTE: squashing into a string doesn't save up gzipped size
-const OP = [
-  'unreachable', 'nop', 'block', 'loop', 'if', 'else', ,,,,,
-  'end', 'br', 'br_if', 'br_table', 'return', 'call', 'call_indirect', ,,,,,,,,
-  'drop', 'select', ,,,,
-  'local.get', 'local.set', 'local.tee', 'global.get', 'global.set', ,,,
-  'i32.load', 'i64.load', 'f32.load', 'f64.load',
-  'i32.load8_s', 'i32.load8_u', 'i32.load16_s', 'i32.load16_u',
-  'i64.load8_s', 'i64.load8_u', 'i64.load16_s', 'i64.load16_u', 'i64.load32_s', 'i64.load32_u',
-  'i32.store', 'i64.store', 'f32.store', 'f64.store',
-  'i32.store8', 'i32.store16', 'i64.store8', 'i64.store16', 'i64.store32',
-  'memory.size', 'memory.grow',
-  'i32.const', 'i64.const', 'f32.const', 'f64.const',
-  'i32.eqz', 'i32.eq', 'i32.ne', 'i32.lt_s', 'i32.lt_u', 'i32.gt_s', 'i32.gt_u', 'i32.le_s', 'i32.le_u', 'i32.ge_s', 'i32.ge_u',
-  'i64.eqz', 'i64.eq', 'i64.ne', 'i64.lt_s', 'i64.lt_u', 'i64.gt_s', 'i64.gt_u', 'i64.le_s', 'i64.le_u', 'i64.ge_s', 'i64.ge_u',
-             'f32.eq', 'f32.ne', 'f32.lt',               'f32.gt',               'f32.le',               'f32.ge',
-             'f64.eq', 'f64.ne', 'f64.lt',               'f64.gt',               'f64.le',               'f64.ge',
-  'i32.clz', 'i32.ctz', 'i32.popcnt', 'i32.add', 'i32.sub', 'i32.mul', 'i32.div_s', 'i32.div_u', 'i32.rem_s', 'i32.rem_u', 'i32.and', 'i32.or', 'i32.xor', 'i32.shl', 'i32.shr_s', 'i32.shr_u', 'i32.rotl', 'i32.rotr',
-  'i64.clz', 'i64.ctz', 'i64.popcnt', 'i64.add', 'i64.sub', 'i64.mul', 'i64.div_s', 'i64.div_u', 'i64.rem_s', 'i64.rem_u', 'i64.and', 'i64.or', 'i64.xor', 'i64.shl', 'i64.shr_s', 'i64.shr_u', 'i64.rotl', 'i64.rotr',
-  'f32.abs', 'f32.neg', 'f32.ceil', 'f32.floor', 'f32.trunc', 'f32.nearest', 'f32.sqrt', 'f32.add', 'f32.sub', 'f32.mul', 'f32.div', 'f32.min', 'f32.max', 'f32.copysign',
-  'f64.abs', 'f64.neg', 'f64.ceil', 'f64.floor', 'f64.trunc', 'f64.nearest', 'f64.sqrt', 'f64.add', 'f64.sub', 'f64.mul', 'f64.div', 'f64.min', 'f64.max', 'f64.copysign',
-  'i32.wrap_i64',
-  'i32.trunc_f32_s', 'i32.trunc_f32_u', 'i32.trunc_f64_s', 'i32.trunc_f64_u', 'i64.extend_i32_s', 'i64.extend_i32_u',
-  'i64.trunc_f32_s', 'i64.trunc_f32_u', 'i64.trunc_f64_s', 'i64.trunc_f64_u',
-  'f32.convert_i32_s', 'f32.convert_i32_u', 'f32.convert_i64_s', 'f32.convert_i64_u', 'f32.demote_f64',
-  'f64.convert_i32_s', 'f64.convert_i32_u', 'f64.convert_i64_s', 'f64.convert_i64_u', 'f64.promote_f32',
-  'i32.reinterpret_f32', 'i64.reinterpret_f64', 'f32.reinterpret_i32', 'f64.reinterpret_i64',
-],
-SECTION = { type:1, import:2, func:3, table:4, memory:5, global:6, export:7, start:8, elem:9, code:10, data:11 },
-TYPE = { i32:0x7f, i64:0x7e, f32:0x7d, f64:0x7c, void:0x40, func:0x60, funcref:0x70 },
-KIND = { func: 0, table: 1, memory: 2, global: 3 },
-ALIGN = {
-  'i32.load': 4, 'i64.load': 8, 'f32.load': 4, 'f64.load': 8,
-  'i32.load8_s': 1, 'i32.load8_u': 1, 'i32.load16_s': 2, 'i32.load16_u': 2,
-  'i64.load8_s': 1, 'i64.load8_u': 1, 'i64.load16_s': 2, 'i64.load16_u': 2, 'i64.load32_s': 4, 'i64.load32_u': 4,  'i32.store': 4,
-  'i64.store': 8, 'f32.store': 4, 'f64.store': 8,
-  'i32.store8': 1, 'i32.store16': 2, 'i64.store8': 1, 'i64.store16': 2, 'i64.store32': 4,
-};
-
-OP.map((op,i)=>OP[op]=i); // init op names
-
-const OPAREN = 40, CPAREN = 41, SPACE = 32, DQUOTE = 34, SEMIC = 59;
-
-var parse = (str) => {
-  let i = 0, level = [], buf = '';
-
-  const commit = () => buf && (
-    level.push(buf),
-    buf = ''
-  );
-
-  const parseLevel = () => {
-    for (let c, root; i < str.length;) {
-      c = str.charCodeAt(i);
-      if (c === DQUOTE) commit(), buf = str.slice(i++, i = str.indexOf('"', i) + 1), commit();
-      else if (c === OPAREN) {
-        if (str.charCodeAt(i + 1) === SEMIC) i = str.indexOf(';)', i) + 2; // (; ... ;)
-        else commit(), i++, (root = level).push(level = []), parseLevel(), level = root;
-      }
-      else if (c === SEMIC) i = str.indexOf('\n', i) + 1;  // ; ...
-      else if (c <= SPACE) commit(), i++;
-      else if (c === CPAREN) return commit(), i++
-      else buf += str[i++];
-    }
-
-    commit();
-  };
-
-  parseLevel();
-
-  return level.length > 1 ? level : level[0]
-};
-
-// some inlinable instructions
-const INLINE = { loop: 1, block: 1, if: 1, end: -1, return: -1 };
-
-// convert wat tree to wasm binary
-var compile = (nodes) => {
-  if (typeof nodes === 'string') nodes = parse(nodes);
-
-  // IR. Alias is stored directly to section array by key, eg. section.func.$name = idx
-  let sections = {
-    type: [], import: [], func: [], table: [], memory: [], global: [], export: [], start: [], elem: [], code: [], data: []
-  }, binary = [
-    0x00, 0x61, 0x73, 0x6d, // magic
-    0x01, 0x00, 0x00, 0x00, // version
-  ];
-
-  // 1. transform tree
-  // (func) → [(func)]
-  if (typeof nodes[0] === 'string' && nodes[0] !== 'module') nodes = [nodes];
-
-  // (global $a (import "a" "b") (mut i32)) → (import "a" "b" (global $a (mut i32)))
-  // (memory (import "a" "b") min max shared) → (import "a" "b" (memory min max shared))
-  nodes = nodes.map(node => {
-    if (node[2]?.[0] === 'import') {
-      let [kind, name, imp, ...args] = node;
-      return [...imp, [kind, name, ...args]]
-    }
-    else if (node[1]?.[0] === 'import') {
-      let [kind, imp, ...args] = node;
-      return [...imp, [kind, ...args]]
-    }
-    return node
-  });
-
-  // 2. build IR. import must be initialized first, global before func, elem after func
-  let order = ['type', 'import', 'table', 'memory', 'global', 'func', 'export', 'start', 'elem', 'data'], postcall = [];
-
-  for (let name of order) {
-    let remaining = [];
-    for (let node of nodes) {
-      node[0] === name ? postcall.push(build[name](node, sections)) : remaining.push(node);
-    }
-
-    nodes = remaining;
-  }
-
-  // code must be compiled after all definitions
-  for (let cb of postcall) cb && cb.call && cb();
-
-
-  // 3. build binary
-  for (let name in sections) {
-    let items = sections[name];
-    if (items.importc) items = items.slice(items.importc); // discard imported functions/globals
-    if (!items.length) continue
-    let sectionCode = SECTION[name], bytes = [];
-    if (sectionCode !== 8) bytes.push(items.length); // skip start section count
-    for (let item of items) bytes.push(...item);
-    binary.push(sectionCode, ...uleb(bytes.length), ...bytes);
-  }
-
-  return new Uint8Array(binary)
-};
-
-const build = {
-  // (type $name? (func (param $x i32) (param i64 i32) (result i32 i64)))
-  // signature part is identical to function
-  // FIXME: handle non-function types
-  type([, typeName, decl], ctx) {
-    if (typeName[0] !== '$') decl = typeName, typeName = null;
-    let params = [], result = [], [kind, ...sig] = decl, idx, bytes;
-
-    if (kind === 'func') {
-      // collect params
-      while (sig[0]?.[0] === 'param') {
-        let [, ...types] = sig.shift();
-        if (types[0]?.[0] === '$') params[types.shift()] = params.length;
-        params.push(...types.map(t => TYPE[t]));
-      }
-
-      // collect result type
-      if (sig[0]?.[0] === 'result') result = sig.shift().slice(1).map(t => TYPE[t]);
-
-      // reuse existing type or register new one
-      bytes = [TYPE.func, ...uleb(params.length), ...params, ...uleb(result.length), ...result];
-
-      idx = ctx.type.findIndex((prevType) => prevType.every((byte, i) => byte === bytes[i]));
-      if (idx < 0) idx = ctx.type.push(bytes) - 1;
-    }
-
-    if (typeName) ctx.type[typeName] = idx;
-
-    return [idx, params, result]
-  },
-
-  // (func $name? ...params result ...body)
-  func([, ...body], ctx) {
-    let locals = [], // list of local variables
-      callstack = [];
-
-    // fn name
-    if (body[0]?.[0] === '$') ctx.func[body.shift()] = ctx.func.length;
-
-    // export binding
-    if (body[0]?.[0] === 'export') build.export([...body.shift(), ['func', ctx.func.length]], ctx);
-
-    // register type
-    let [typeIdx, params, result] = build.type([, ['func', ...body]], ctx);
-    // FIXME: try merging with build.type: it should be able to consume body
-    while (body[0]?.[0] === 'param' || body[0]?.[0] === 'result') body.shift();
-    ctx.func.push([typeIdx]);
-
-    // collect locals
-    while (body[0]?.[0] === 'local') {
-      let [, ...types] = body.shift(), name;
-      if (types[0][0] === '$')
-        params[name = types.shift()] ? err('Ambiguous name ' + name) :
-          locals[name] = params.length + locals.length;
-      locals.push(...types.map(t => TYPE[t]));
-    }
-
-    // squash local types
-    let locTypes = locals.reduce((a, type) => (type == a[a.length - 1] ? a[a.length - 2]++ : a.push(1, type), a), []);
-
-    // map code instruction into bytes: [args, opCode, immediates]
-    const instr = (group) => {
-      let [op, ...nodes] = group;
-      let opCode = OP[op], argc = 0, before = [], after = [], id;
-
-      // NOTE: we could reorganize ops by groups and detect signature as `op in STORE`
-      // but numeric comparison is faster than generic hash lookup
-      // FIXME: we often use OP.end or alike: what if we had list of global constants?
-
-      // binary/unary
-      if (opCode >= 69) {
-        argc = opCode >= 167 ||
-          (opCode <= 159 && opCode >= 153) ||
-          (opCode <= 145 && opCode >= 139) ||
-          (opCode <= 123 && opCode >= 121) ||
-          (opCode <= 105 && opCode >= 103) ||
-          opCode == 80 || opCode == 69 ? 1 : 2;
-      }
-      // instruction
-      else {
-        // (i32.store align=n offset=m at value)
-        if (opCode >= 40 && opCode <= 62) {
-          // FIXME: figure out point in Math.log2 aligns
-          let o = { align: ALIGN[op], offset: 0 }, p;
-          while (nodes[0]?.includes('=')) p = nodes.shift().split('='), o[p[0]] = Number(p[1]);
-          after = [Math.log2(o.align), ...uleb(o.offset)];
-          argc = opCode >= 54 ? 2 : 1;
-        }
-
-        // (i32.const 123)
-        else if (opCode >= 65 && opCode <= 68) {
-          after = (opCode == 65 ? leb : opCode == 66 ? bigleb : opCode == 67 ? f32 : f64)(nodes.shift());
-        }
-
-        // (local.get $id), (local.tee $id x)
-        else if (opCode >= 32 && opCode <= 34) {
-          after = uleb(nodes[0]?.[0] === '$' ? params[id = nodes.shift()] || locals[id] : nodes.shift());
-          if (opCode > 32) argc = 1;
-        }
-
-        // (global.get id), (global.set id)
-        else if (opCode == 35 || opCode == 36) {
-          after = uleb(nodes[0]?.[0] === '$' ? ctx.global[nodes.shift()] : nodes.shift());
-          if (opCode > 35) argc = 1;
-        }
-
-        // (call id ...nodes)
-        else if (opCode == 16) {
-          let fnName = nodes.shift();
-          after = uleb(id = fnName[0] === '$' ? ctx.func[fnName] ?? err('Unknown function `' + fnName + '`') : fnName);
-          // FIXME: how to get signature of imported function
-          [, argc] = ctx.type[ctx.func[id][0]];
-        }
-
-        // (call_indirect (type $typeName) (idx) ...nodes)
-        else if (opCode == 17) {
-          let typeId = nodes.shift()[1];
-          [, argc] = ctx.type[typeId = typeId[0] === '$' ? ctx.type[typeId] : typeId];
-          argc++;
-          after = uleb(typeId), after.push(0); // extra afterediate indicates table idx (reserved)
-        }
-
-        // FIXME (memory.grow $idx?)
-        else if (opCode == 63 || opCode == 64) {
-          after = [0];
-          argc = 1;
-        }
-
-        // (if (result i32)? (local.get 0) (then a b) (else a b)?)
-        else if (opCode == 4) {
-          callstack.push(opCode);
-          let [, type] = nodes[0][0] === 'result' ? nodes.shift() : [, 'void'];
-          after = [TYPE[type]];
-
-          argc = 0, before.push(...instr(nodes.shift()));
-          let body;
-          if (nodes[0]?.[0] === 'then') [, ...body] = nodes.shift(); else body = nodes;
-          after.push(...consume(body));
-
-          callstack.pop(), callstack.push(OP.else);
-          if (nodes[0]?.[0] === 'else') {
-            [, ...body] = nodes.shift();
-            if (body.length) after.push(OP.else, ...consume(body));
-          }
-          callstack.pop();
-          after.push(OP.end);
-        }
-
-        // (drop arg?), (return arg?)
-        else if (opCode == 0x1a || opCode == 0x0f) { argc = nodes.length ? 1 : 0; }
-
-        // (select a b cond)
-        else if (opCode == 0x1b) { argc = 3; }
-
-        // (block ...), (loop ...)
-        else if (opCode == 2 || opCode == 3) {
-          callstack.push(opCode);
-          if (nodes[0]?.[0] === '$') (callstack[nodes.shift()] = callstack.length);
-          let [, type] = nodes[0]?.[0] === 'result' ? nodes.shift() : [, 'void'];
-          after = [TYPE[type], ...consume(nodes)];
-
-          if (!group.inline) callstack.pop(), after.push(OP.end); // inline loop/block expects end to be separately provided
-        }
-
-        // (end)
-        else if (opCode == 0x0b) callstack.pop();
-
-        // (br $label result?)
-        // (br_if $label cond result?)
-        else if (opCode == 0x0c || opCode == 0x0d) {
-          // br index indicates how many callstack items to pop
-          after = uleb(nodes[0]?.[0] === '$' ? callstack.length - callstack[nodes.shift()] : nodes.shift());
-          argc = (opCode == 0x0d ? 1 + (nodes.length > 1) : !!nodes.length);
-        }
-
-        // (br_table 1 2 3 4  0  selector result?)
-        else if (opCode == 0x0e) {
-          after = [];
-          while (!Array.isArray(nodes[0])) id = nodes.shift(), after.push(...uleb(id[0][0] === '$' ? callstack.length - callstack[id] : id));
-          after.unshift(...uleb(after.length - 1));
-          argc = 1 + (nodes.length > 1);
-        }
-
-        else if (opCode == null) err(`Unknown instruction \`${op}\``);
-      }
-
-      // consume arguments
-      if (nodes.length < argc) err(`Stack arguments are not supported at \`${op}\``);
-      while (argc--) before.push(...instr(nodes.shift()));
-      if (nodes.length) err(`Too many arguments for \`${op}\`.`);
-
-      return [...before, opCode, ...after]
-    };
-
-    // consume sequence of nodes
-    const consume = nodes => {
-      let result = [];
-      while (nodes.length) {
-        let node = nodes.shift(), c;
-
-        if (typeof node === 'string') {
-          // permit some inline instructions: loop $label ... end,  br $label,  arg return
-          if (c = INLINE[node]) {
-            node = [node], node.inline = true;
-            if (c > 0) nodes[0]?.[0] === '$' && node.push(nodes.shift());
-          }
-          else err(`Inline instruction \`${node}\` is not supported`);
-        }
-
-        node && result.push(...instr(node));
-      }
-      return result
-    };
-
-    // evaluates after all definitions
-    return () => {
-      let code = consume(body);
-      ctx.code.push([...uleb(code.length + 2 + locTypes.length), ...uleb(locTypes.length >> 1), ...locTypes, ...code, OP.end]);
-    }
-  },
-
-  // (memory min max shared)
-  // (memory $name min max shared)
-  // (memory (export "mem") 5)
-  memory([, ...parts], ctx) {
-    if (parts[0][0] === '$') ctx.memory[parts.shift()] = ctx.memory.length;
-    if (parts[0][0] === 'export') build.export([...parts.shift(), ['memory', ctx.memory.length]], ctx);
-    ctx.memory.push(range(parts));
-  },
-
-  // (global i32 (i32.const 42))
-  // (global $id i32 (i32.const 42))
-  // (global $id (mut i32) (i32.const 42))
-  global([, ...args], ctx) {
-    let name = args[0][0] === '$' && args.shift();
-    if (name) ctx.global[name] = ctx.global.length;
-    let [type, init] = args, mut = type[0] === 'mut' ? 1 : 0;
-    ctx.global.push([TYPE[mut ? type[1] : type], mut, ...iinit(init)]);
-  },
-
-  // (table 1 2? funcref)
-  // (table $name 1 2? funcref)
-  table([, ...args], ctx) {
-    let name = args[0][0] === '$' && args.shift();
-    if (name) ctx.table[name] = ctx.table.length;
-    let lims = range(args);
-    ctx.table.push([TYPE[args.pop()], ...lims]);
-  },
-
-  // (elem (i32.const 0) $f1 $f2), (elem (global.get 0) $f1 $f2)
-  elem([, offset, ...elems], ctx) {
-    const tableIdx = 0; // FIXME: table index can be defined
-    ctx.elem.push([tableIdx, ...iinit(offset, ctx), ...uleb(elems.length), ...elems.flatMap(el => uleb(el[0] === '$' ? ctx.func[el] : el))]);
-  },
-
-  //  (export "name" (kind $name|idx))
-  export([, name, [kind, idx]], ctx) {
-    if (idx[0] === '$') idx = ctx[kind][idx];
-    ctx.export.push([...str(name), KIND[kind], ...uleb(idx)]);
-  },
-
-  // (import "math" "add" (func $add (param i32 i32 externref) (result i32)))
-  // (import "js" "mem" (memory 1))
-  // (import "js" "mem" (memory $name 1))
-  // (import "js" "v" (global $name (mut f64)))
-  import([, mod, field, ref], ctx) {
-    let details, [kind, ...parts] = ref,
-      name = parts[0]?.[0] === '$' && parts.shift();
-
-    if (kind === 'func') {
-      // we track imported funcs in func section to share namespace, and skip them on final build
-      if (name) ctx.func[name] = ctx.func.length;
-      let [typeIdx] = build.type([, ['func', ...parts]], ctx);
-      ctx.func.push(details = uleb(typeIdx));
-      ctx.func.importc = (ctx.func.importc || 0) + 1;
-    }
-    else if (kind === 'memory') {
-      if (name) ctx.memory[name] = ctx.memory.length;
-      details = range(parts);
-    }
-    else if (kind === 'global') {
-      // imported globals share namespace with internal globals - we skip them in final build
-      if (name) ctx.global[name] = ctx.global.length;
-      let [type] = parts, mut = type[0] === 'mut' ? 1 : 0;
-      details = [TYPE[mut ? type[1] : type], mut];
-      ctx.global.push(details);
-      ctx.global.importc = (ctx.global.importc || 0) + 1;
-    }
-    else throw Error('Unimplemented ' + kind)
-
-    ctx.import.push([...str(mod), ...str(field), KIND[kind], ...details]);
-  },
-
-  // (data (i32.const 0) "\aa" "\bb"?)
-  data([, offset, ...inits], ctx) {
-    // FIXME: first is mem index
-    ctx.data.push([0, ...iinit(offset, ctx), ...str(inits.map(i => i[0] === '"' ? i.slice(1, -1) : i).join(''))]);
-  },
-
-  // (start $main)
-  start([, name], ctx) {
-    if (!ctx.start.length) ctx.start.push([name[0] === '$' ? ctx.func[name] : name]);
-  }
-};
-
-// (i32.const 0) - instantiation time initializer
-const iinit = ([op, literal], ctx) => op[0] === 'f' ?
-  [OP[op], ...(op[1] === '3' ? f32 : f64)(literal), OP.end] :
-  [OP[op], ...(op[1] === '3' ? leb : bigleb)(literal[0] === '$' ? ctx.global[literal] : literal), OP.end];
-
-const escape = { n: 10, r: 13, t: 9, v: 1 };
-
-// build string binary
-const str = str => {
-  str = str[0] === '"' ? str.slice(1, -1) : str;
-  let res = [], i = 0, c, BSLASH = 92;
-  // spec https://webassembly.github.io/spec/core/text/values.html#strings
-  for (; i < str.length;) {
-    c = str.charCodeAt(i++);
-    res.push(c === BSLASH ? escape[str[i++]] || parseInt(str.slice(i - 1, ++i), 16) : c);
-  }
-
-  res.unshift(...uleb(res.length));
-  return res
-};
-
-
-// build range/limits sequence (non-consuming)
-const range = ([min, max, shared]) => isNaN(parseInt(max)) ? [0, ...uleb(min)] : [shared === 'shared' ? 3 : 1, ...uleb(min), ...uleb(max)];
-
-const err = text => { throw Error(text) };
-
-let indent = '', newline = '\n', pad = '', comments = false;
-
-function print(tree, options = {}) {
-  if (typeof tree === 'string') tree = parse(tree);
-
-  ({ indent, newline, pad, comments } = options);
-  newline ||= '';
-  pad ||= '';
-  indent ||= '';
-
-  let out = typeof tree[0] === 'string' ? printNode(tree) : tree.map(node => printNode(node)).join(newline);
-
-  return out
-}
-
-const flats = ['param', 'local', 'global', 'result', 'export'];
-
-function printNode(node, level = 0) {
-  if (!Array.isArray(node)) return node + ''
-
-  let content = node[0];
-
-  for (let i = 1; i < node.length; i++) {
-    // new node doesn't need space separator, eg. [x,[y]] -> `x(y)`
-    if (Array.isArray(node[i])) {
-      // inline nodes like (param x)(param y)
-      // (func (export "xxx")..., but not (func (export "a")(param "b")...
-      if (
-        flats.includes(node[i][0]) &&
-        (!Array.isArray(node[i - 1]) || node[i][0] === node[i - 1][0])
-      ) {
-        if (!Array.isArray(node[i - 1])) content += ` `;
-      } else {
-        content += newline;
-        if (node[i]) content += indent.repeat(level + 1);
-      }
-
-      content += printNode(node[i], level + 1);
-    }
-    else {
-      content += ` `;
-      content += node[i];
-    }
-  }
-  return `(${content})`
-}
-
-export { compile, compile as default, parse, print };
+export default compile
+export { compile, parse, print }

package/watr.min.js

@@ -1 +0,0 @@
-const e=(t,i=[])=>{"string"==typeof t&&(t=parseInt(t.replaceAll("_","")));let l=127&t;return 0==(t>>>=7)?(i.push(l),i):(i.push(128|l),e(t,i))};function t(e,t=[]){for("string"==typeof e&&(e=parseInt(e.replaceAll("_","")));;){const i=Number(127&e);if(0==(e>>=7)&&0==(64&i)||-1===e&&0!=(64&i)){t.push(i);break}t.push(128|i)}return t}function i(e,t=[]){for("string"==typeof e&&(e="-"===(e=e.replaceAll("_",""))[0]?-BigInt(e.slice(1)):BigInt(e),n.setBigInt64(0,e),e=n.getBigInt64(0));;){const i=Number(0x7Fn&e);if(0n===(e>>=7n)&&0==(64&i)||-1n===e&&0!=(64&i)){t.push(i);break}t.push(128|i)}return t}const l=e=>"nan"===e||"+nan"===e||"-nan"===e?NaN:"inf"===e||"+inf"===e?1/0:"-inf"===e?-1/0:parseFloat(e.replaceAll("_","")),n=new DataView(new BigInt64Array(1).buffer);function r(e,t,i){return~(i=e.indexOf("nan:"))?(t=parseInt(e.slice(i+4)),t|=2139095040,"-"===e[0]&&(t|=2147483648),n.setInt32(0,t)):(t="string"==typeof e?l(e):e,n.setFloat32(0,t)),[n.getUint8(3),n.getUint8(2),n.getUint8(1),n.getUint8(0)]}const s=0x8000000000000000n,o=0x7ff0000000000000n;function f(e,t,i){return~(i=e.indexOf("nan:"))?(t=BigInt(e.slice(i+4)),t|=o,"-"===e[0]&&(t|=s),n.setBigInt64(0,t)):(t="string"==typeof e?l(e):e,n.setFloat64(0,t)),[n.getUint8(7),n.getUint8(6),n.getUint8(5),n.getUint8(4),n.getUint8(3),n.getUint8(2),n.getUint8(1),n.getUint8(0)]}const u=["unreachable","nop","block","loop","if","else",,,,,,"end","br","br_if","br_table","return","call","call_indirect",,,,,,,,,"drop","select",,,,,"local.get","local.set","local.tee","global.get","global.set",,,,"i32.load","i64.load","f32.load","f64.load","i32.load8_s","i32.load8_u","i32.load16_s","i32.load16_u","i64.load8_s","i64.load8_u","i64.load16_s","i64.load16_u","i64.load32_s","i64.load32_u","i32.store","i64.store","f32.store","f64.store","i32.store8","i32.store16","i64.store8","i64.store16","i64.store32","memory.size","memory.grow","i32.const","i64.const","f32.const","f64.const","i32.eqz","i32.eq","i32.ne","i32.lt_s","i32.lt_u","i32.gt_s","i32.gt_u","i32.le_s","i32.le_u","i32.ge_s","i32.ge_u","i64.eqz","i64.eq","i64.ne","i64.lt_s","i64.lt_u","i64.gt_s","i64.gt_u","i64.le_s","i64.le_u","i64.ge_s","i64.ge_u","f32.eq","f32.ne","f32.lt","f32.gt","f32.le","f32.ge","f64.eq","f64.ne","f64.lt","f64.gt","f64.le","f64.ge","i32.clz","i32.ctz","i32.popcnt","i32.add","i32.sub","i32.mul","i32.div_s","i32.div_u","i32.rem_s","i32.rem_u","i32.and","i32.or","i32.xor","i32.shl","i32.shr_s","i32.shr_u","i32.rotl","i32.rotr","i64.clz","i64.ctz","i64.popcnt","i64.add","i64.sub","i64.mul","i64.div_s","i64.div_u","i64.rem_s","i64.rem_u","i64.and","i64.or","i64.xor","i64.shl","i64.shr_s","i64.shr_u","i64.rotl","i64.rotr","f32.abs","f32.neg","f32.ceil","f32.floor","f32.trunc","f32.nearest","f32.sqrt","f32.add","f32.sub","f32.mul","f32.div","f32.min","f32.max","f32.copysign","f64.abs","f64.neg","f64.ceil","f64.floor","f64.trunc","f64.nearest","f64.sqrt","f64.add","f64.sub","f64.mul","f64.div","f64.min","f64.max","f64.copysign","i32.wrap_i64","i32.trunc_f32_s","i32.trunc_f32_u","i32.trunc_f64_s","i32.trunc_f64_u","i64.extend_i32_s","i64.extend_i32_u","i64.trunc_f32_s","i64.trunc_f32_u","i64.trunc_f64_s","i64.trunc_f64_u","f32.convert_i32_s","f32.convert_i32_u","f32.convert_i64_s","f32.convert_i64_u","f32.demote_f64","f64.convert_i32_s","f64.convert_i32_u","f64.convert_i64_s","f64.convert_i64_u","f64.promote_f32","i32.reinterpret_f32","i64.reinterpret_f64","f32.reinterpret_i32","f64.reinterpret_i64"],a={type:1,import:2,func:3,table:4,memory:5,global:6,export:7,start:8,elem:9,code:10,data:11},p={i32:127,i64:126,f32:125,f64:124,void:64,func:96,funcref:112},h={func:0,table:1,memory:2,global:3},c={"i32.load":4,"i64.load":8,"f32.load":4,"f64.load":8,"i32.load8_s":1,"i32.load8_u":1,"i32.load16_s":2,"i32.load16_u":2,"i64.load8_s":1,"i64.load8_u":1,"i64.load16_s":2,"i64.load16_u":2,"i64.load32_s":4,"i64.load32_u":4,"i32.store":4,"i64.store":8,"f32.store":4,"f64.store":8,"i32.store8":1,"i32.store16":2,"i64.store8":1,"i64.store16":2,"i64.store32":4};u.map(((e,t)=>u[e]=t));var g=e=>{let t=0,i=[],l="";const n=()=>l&&(i.push(l),l=""),r=()=>{for(let s,o;t<e.length;)if(s=e.charCodeAt(t),34===s)n(),l=e.slice(t++,t=e.indexOf('"',t)+1),n();else if(40===s)59===e.charCodeAt(t+1)?t=e.indexOf(";)",t)+2:(n(),t++,(o=i).push(i=[]),r(),i=o);else if(59===s)t=e.indexOf("\n",t)+1;else if(s<=32)n(),t++;else{if(41===s)return n(),t++;l+=e[t++]}n()};return r(),i.length>1?i:i[0]};const _={loop:1,block:1,if:1,end:-1,return:-1};var d=t=>{"string"==typeof t&&(t=g(t));let i={type:[],import:[],func:[],table:[],memory:[],global:[],export:[],start:[],elem:[],code:[],data:[]},l=[0,97,115,109,1,0,0,0];"string"==typeof t[0]&&"module"!==t[0]&&(t=[t]),t=t.map((e=>{if("import"===e[2]?.[0]){let[t,i,l,...n]=e;return[...l,[t,i,...n]]}if("import"===e[1]?.[0]){let[t,i,...l]=e;return[...i,[t,...l]]}return e}));let n=["type","import","table","memory","global","func","export","start","elem","data"],r=[];for(let e of n){let l=[];for(let n of t)n[0]===e?r.push(m[e](n,i)):l.push(n);t=l}for(let e of r)e&&e.call&&e();for(let t in i){let n=i[t];if(n.importc&&(n=n.slice(n.importc)),!n.length)continue;let r=a[t],s=[];8!==r&&s.push(n.length);for(let e of n)s.push(...e);l.push(r,...e(s.length),...s)}return new Uint8Array(l)};const m={type([,t,i],l){"$"!==t[0]&&(i=t,t=null);let n,r,s=[],o=[],[f,...u]=i;if("func"===f){for(;"param"===u[0]?.[0];){let[,...e]=u.shift();"$"===e[0]?.[0]&&(s[e.shift()]=s.length),s.push(...e.map((e=>p[e])))}"result"===u[0]?.[0]&&(o=u.shift().slice(1).map((e=>p[e]))),r=[p.func,...e(s.length),...s,...e(o.length),...o],n=l.type.findIndex((e=>e.every(((e,t)=>e===r[t])))),n<0&&(n=l.type.push(r)-1)}return t&&(l.type[t]=n),[n,s,o]},func([,...l],n){let s=[],o=[];"$"===l[0]?.[0]&&(n.func[l.shift()]=n.func.length),"export"===l[0]?.[0]&&m.export([...l.shift(),["func",n.func.length]],n);let[a,h,g]=m.type([,["func",...l]],n);for(;"param"===l[0]?.[0]||"result"===l[0]?.[0];)l.shift();for(n.func.push([a]);"local"===l[0]?.[0];){let e,[,...t]=l.shift();"$"===t[0][0]&&(h[e=t.shift()]?v("Ambiguous name "+e):s[e]=h.length+s.length),s.push(...t.map((e=>p[e])))}let d=s.reduce(((e,t)=>(t==e[e.length-1]?e[e.length-2]++:e.push(1,t),e)),[]);const y=l=>{let a,[g,..._]=l,d=u[g],m=0,x=[],$=[];if(d>=69)m=d>=167||d<=159&&d>=153||d<=145&&d>=139||d<=123&&d>=121||d<=105&&d>=103||80==d||69==d?1:2;else if(d>=40&&d<=62){let t,i={align:c[g],offset:0};for(;_[0]?.includes("=");)t=_.shift().split("="),i[t[0]]=Number(t[1]);$=[Math.log2(i.align),...e(i.offset)],m=d>=54?2:1}else if(d>=65&&d<=68)$=(65==d?t:66==d?i:67==d?r:f)(_.shift());else if(d>=32&&d<=34)$=e("$"===_[0]?.[0]?h[a=_.shift()]||s[a]:_.shift()),d>32&&(m=1);else if(35==d||36==d)$=e("$"===_[0]?.[0]?n.global[_.shift()]:_.shift()),d>35&&(m=1);else if(16==d){let t=_.shift();$=e(a="$"===t[0]?n.func[t]??v("Unknown function `"+t+"`"):t),[,m]=n.type[n.func[a][0]]}else if(17==d){let t=_.shift()[1];[,m]=n.type[t="$"===t[0]?n.type[t]:t],m++,$=e(t),$.push(0)}else if(63==d||64==d)$=[0],m=1;else if(4==d){o.push(d);let e,[,t]="result"===_[0][0]?_.shift():[,"void"];$=[p[t]],m=0,x.push(...y(_.shift())),"then"===_[0]?.[0]?[,...e]=_.shift():e=_,$.push(...b(e)),o.pop(),o.push(u.else),"else"===_[0]?.[0]&&([,...e]=_.shift(),e.length&&$.push(u.else,...b(e))),o.pop(),$.push(u.end)}else if(26==d||15==d)m=_.length?1:0;else if(27==d)m=3;else if(2==d||3==d){o.push(d),"$"===_[0]?.[0]&&(o[_.shift()]=o.length);let[,e]="result"===_[0]?.[0]?_.shift():[,"void"];$=[p[e],...b(_)],l.inline||(o.pop(),$.push(u.end))}else if(11==d)o.pop();else if(12==d||13==d)$=e("$"===_[0]?.[0]?o.length-o[_.shift()]:_.shift()),m=13==d?1+(_.length>1):!!_.length;else if(14==d){for($=[];!Array.isArray(_[0]);)a=_.shift(),$.push(...e("$"===a[0][0]?o.length-o[a]:a));$.unshift(...e($.length-1)),m=1+(_.length>1)}else null==d&&v(`Unknown instruction \`${g}\``);for(_.length<m&&v(`Stack arguments are not supported at \`${g}\``);m--;)x.push(...y(_.shift()));return _.length&&v(`Too many arguments for \`${g}\`.`),[...x,d,...$]},b=e=>{let t=[];for(;e.length;){let i,l=e.shift();"string"==typeof l&&((i=_[l])?(l=[l],l.inline=!0,i>0&&"$"===e[0]?.[0]&&l.push(e.shift())):v(`Inline instruction \`${l}\` is not supported`)),l&&t.push(...y(l))}return t};return()=>{let t=b(l);n.code.push([...e(t.length+2+d.length),...e(d.length>>1),...d,...t,u.end])}},memory([,...e],t){"$"===e[0][0]&&(t.memory[e.shift()]=t.memory.length),"export"===e[0][0]&&m.export([...e.shift(),["memory",t.memory.length]],t),t.memory.push($(e))},global([,...e],t){let i="$"===e[0][0]&&e.shift();i&&(t.global[i]=t.global.length);let[l,n]=e,r="mut"===l[0]?1:0;t.global.push([p[r?l[1]:l],r,...y(n)])},table([,...e],t){let i="$"===e[0][0]&&e.shift();i&&(t.table[i]=t.table.length);let l=$(e);t.table.push([p[e.pop()],...l])},elem([,t,...i],l){l.elem.push([0,...y(t,l),...e(i.length),...i.flatMap((t=>e("$"===t[0]?l.func[t]:t)))])},export([,t,[i,l]],n){"$"===l[0]&&(l=n[i][l]),n.export.push([...x(t),h[i],...e(l)])},import([,t,i,l],n){let r,[s,...o]=l,f="$"===o[0]?.[0]&&o.shift();if("func"===s){f&&(n.func[f]=n.func.length);let[t]=m.type([,["func",...o]],n);n.func.push(r=e(t)),n.func.importc=(n.func.importc||0)+1}else if("memory"===s)f&&(n.memory[f]=n.memory.length),r=$(o);else{if("global"!==s)throw Error("Unimplemented "+s);{f&&(n.global[f]=n.global.length);let[e]=o,t="mut"===e[0]?1:0;r=[p[t?e[1]:e],t],n.global.push(r),n.global.importc=(n.global.importc||0)+1}}n.import.push([...x(t),...x(i),h[s],...r])},data([,e,...t],i){i.data.push([0,...y(e,i),...x(t.map((e=>'"'===e[0]?e.slice(1,-1):e)).join(""))])},start([,e],t){t.start.length||t.start.push(["$"===e[0]?t.func[e]:e])}},y=([e,l],n)=>"f"===e[0]?[u[e],...("3"===e[1]?r:f)(l),u.end]:[u[e],...("3"===e[1]?t:i)("$"===l[0]?n.global[l]:l),u.end],b={n:10,r:13,t:9,v:1},x=t=>{t='"'===t[0]?t.slice(1,-1):t;let i,l=[],n=0;for(;n<t.length;)i=t.charCodeAt(n++),l.push(92===i?b[t[n++]]||parseInt(t.slice(n-1,++n),16):i);return l.unshift(...e(l.length)),l},$=([t,i,l])=>isNaN(parseInt(i))?[0,...e(t)]:["shared"===l?3:1,...e(t),...e(i)],v=e=>{throw Error(e)};let A="",U="\n",I="",w=!1;function q(e,t={}){return"string"==typeof e&&(e=g(e)),({indent:A,newline:U,pad:I,comments:w}=t),U||="",I||="",A||="","string"==typeof e[0]?z(e):e.map((e=>z(e))).join(U)}const k=["param","local","global","result","export"];function z(e,t=0){if(!Array.isArray(e))return e+"";let i=e[0];for(let l=1;l<e.length;l++)Array.isArray(e[l])?(!k.includes(e[l][0])||Array.isArray(e[l-1])&&e[l][0]!==e[l-1][0]?(i+=U,e[l]&&(i+=A.repeat(t+1))):Array.isArray(e[l-1])||(i+=" "),i+=z(e[l],t+1)):(i+=" ",i+=e[l]);return`(${i})`}export{d as compile,d as default,g as parse,q as print};