compiler: API cleanup (#591)

Author: pdubroy

packages/compiler/scripts/parseLiquid.js

@@ -16,14 +16,16 @@ import {fileURLToPath} from 'node:url';
 import * as ohm from 'ohm-js-legacy';
 import {Bench} from 'tinybench';
 
-import {Compiler} from '../src/Compiler.ts';
-import {unparse, legacyGrammarToWasm} from '../test/_helpers.js';
+import {Grammar} from 'ohm-js';
+import {compileGrammars} from '../src/api.ts';
+import {unparse} from '../test/_helpers.js';
 import {createReader} from '../../runtime/src/cstReader.ts';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const datadir = join(__dirname, '../test/data');
 
-const liquid = ohm.grammars(readFileSync(join(datadir, 'liquid-html.ohm'), 'utf8'));
+const grammarSource = readFileSync(join(datadir, 'liquid-html.ohm'), 'utf8');
+const liquid = ohm.grammars(grammarSource);
 
 // Parse flags and positional args.
 const flags = new Set(process.argv.slice(2).filter(a => a.startsWith('--')));
@@ -79,9 +81,10 @@ const pattern = positionalArgs[0];
 
   // Compile to Wasm.
   const compileStart = bench.now();
-  const modBytes = new Compiler(liquid.LiquidHTML).compile();
+  const allBytes = compileGrammars(grammarSource);
   const compileTime = bench.now() - compileStart;
-  const g = await legacyGrammarToWasm(liquid.LiquidHTML, {modBytes});
+  const modBytes = allBytes.LiquidHTML;
+  const g = await Grammar.instantiate(modBytes);
   const {exports} = g._instance;
   let peakWasmHeapBytes = 0;
   let peakWasmMemoryBytes = 0;

packages/compiler/scripts/parsePipRequirements.js

@@ -11,12 +11,15 @@ import process from 'node:process';
 import {fileURLToPath} from 'node:url';
 import * as ohm from 'ohm-js-legacy';
 
-import {unparse, legacyGrammarToWasm} from '../test/_helpers.js';
+import {Grammar} from 'ohm-js';
+import {compile} from '../src/api.ts';
+import {unparse} from '../test/_helpers.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const datadir = join(__dirname, '../test/data');
 
-const grammar = ohm.grammar(readFileSync(join(datadir, 'pep-508.ohm'), 'utf8'));
+const grammarSource = readFileSync(join(datadir, 'pep-508.ohm'), 'utf8');
+const grammar = ohm.grammar(grammarSource);
 const input = readFileSync(join(datadir, 'requirements_all.txt'), 'utf8');
 
 (async function main() {
@@ -32,7 +35,8 @@ const input = readFileSync(join(datadir, 'requirements_all.txt'), 'utf8');
   assert.equal(r.succeeded(), true, `JS parse failed: ${r.shortMessage}`);
 
   // --- Wasm ---
-  const g = await legacyGrammarToWasm(grammar);
+  const modBytes = compile(grammarSource);
+  const g = await Grammar.instantiate(modBytes);
   const {exports} = g._instance;
 
   const wasmStart = performance.now();

packages/compiler/test/_helpers.js

@@ -51,9 +51,9 @@ async function _compileAndInstantiate(parsedGrammar, compilerOpts) {
 
 // Takes a *legacy* ohm-js Grammar object and compiles it to Wasm.
 // Use this only in tests that deliberately compare Wasm vs legacy behavior.
-export async function legacyGrammarToWasm(grammar, {modBytes, ...compilerOpts} = {}) {
+export async function legacyGrammarToWasm(grammar, compilerOpts = {}) {
   const compiler = new Compiler(grammar, compilerOpts);
-  const bytes = modBytes ?? compiler.compile();
+  const bytes = compiler.compile();
 
   const wasmGrammar = new Grammar();