watr 4.0.0 → 4.1.0

package/bin/watr.js

@@ -7,6 +7,7 @@
  *   watr input.wat -o output.wasm     # compile to output.wasm
  *   watr input.wat --print            # pretty-print WAT
  *   watr input.wat --minify           # minify WAT
+ *   watr input.wat --polyfill         # polyfill newer features to MVP
  *   watr --help                       # show help
  *
  * @module watr/bin
@@ -16,10 +17,32 @@ import { readFileSync, writeFileSync } from 'fs'
 import { basename } from 'path'
 import compile from '../src/compile.js'
 import print from '../src/print.js'
+import polyfill from '../src/polyfill.js'
+import parse from '../src/parse.js'
 
 const args = process.argv.slice(2)
-const flags = new Set(args.filter(a => a.startsWith('-')))
-const files = args.filter(a => !a.startsWith('-'))
+
+// Parse polyfill option first (to exclude feature arg from files)
+let polyfillOpts = null
+const polyfillIdx = args.findIndex(a => a === '--polyfill')
+let polyfillFeatureArg = null
+if (polyfillIdx !== -1) {
+  // Check if next arg is feature list (not a flag or file)
+  const next = args[polyfillIdx + 1]
+  if (next && !next.startsWith('-') && !next.includes('.') && next !== '-') {
+    polyfillOpts = next
+    polyfillFeatureArg = next
+  } else {
+    polyfillOpts = true
+  }
+}
+
+// Parse -o output arg
+const outIdx = args.findIndex(a => a === '-o' || a === '--output')
+const outArg = outIdx !== -1 ? args[outIdx + 1] : null
+
+const flags = new Set(args.filter(a => a.startsWith('-') && a !== '-'))
+const files = args.filter(a => (!a.startsWith('-') || a === '-') && a !== polyfillFeatureArg && a !== outArg)
 
 // Help
 if (flags.has('-h') || flags.has('--help') || !files.length) {
@@ -33,12 +56,17 @@ Options:
   -o, --output <file>   Output file (default: input.wasm)
   -p, --print           Pretty-print WAT to stdout
   -m, --minify          Minify WAT to stdout
+  --polyfill [features] Polyfill newer features to MVP (default: all)
+                        Features: funcref sign_ext nontrapping bulk_memory
+                                  return_call i31ref extended_const multi_value
   -h, --help            Show this help
 
 Examples:
   watr add.wat                    # → add.wasm
   watr add.wat -o lib/add.wasm    # → lib/add.wasm
   watr add.wat --print            # pretty-print
+  watr add.wat --polyfill         # polyfill all features
+  watr add.wat --polyfill funcref # polyfill specific features
   cat add.wat | watr -            # stdin → stdout (binary)
 
 ॐ https://github.com/dy/watr
@@ -65,10 +93,11 @@ if (flags.has('-m') || flags.has('--minify')) {
 }
 
 // Compile mode
-const binary = compile(src)
+let ast = parse(src)
+if (polyfillOpts) ast = polyfill(ast, polyfillOpts)
+const binary = compile(ast)
 
 // Output
-const outIdx = args.findIndex(a => a === '-o' || a === '--output')
 const output = outIdx !== -1 && args[outIdx + 1]
   ? args[outIdx + 1]
   : input === '-'