wasm: fix build (?)

Author: pdubroy

.eslintignore

@@ -7,4 +7,5 @@
 ava-ts.config.js
 visualizer/assets/**
 packages/cli/src/helpers/generateTypes.test.js
+packages/wasm/build/**
 packages/wasm/runtime/**

packages/wasm/Makefile

@@ -26,7 +26,7 @@ build/%.O3.wasm: build/%.wasm
 	wasm-opt -O3 --enable-bulk-memory-opt -o $@ $<
 
 dist/index.js: build/ohmRuntime.wasm_sections.ts $(SRC_JS_FILES) $(SRC_TS_FILES)
-	pnpm esbuild src/index.js --bundle --loader:.ts=ts --outfile=dist/index.js --format=esm --platform=node --external:ohm-js
+	pnpm esbuild index.ts --bundle --loader:.ts=ts --outfile=dist/index.js --format=esm --platform=node --external:ohm-js
 
 dist/cli.js: dist/index.js src/cli.js
 	pnpm esbuild src/cli.js --bundle --loader:.ts=ts --outfile=dist/cli.js --format=esm --platform=node  --external:ohm-js --external:./index.js --banner:js="#!/usr/bin/env node"

packages/wasm/scripts/es5ToWasm.js

@@ -1,7 +1,7 @@
 import {writeFileSync} from 'node:fs';
 import process from 'node:process';
 
-import {Compiler} from '../src/index.js';
+import {Compiler} from '../src/Compiler.js';
 import es5 from '../test/data/_es5.js';
 
 const outFilename = process.argv[2];

packages/wasm/src/ir.ts

@@ -40,13 +40,15 @@ export interface Any {
 
 export const any = (): Any => ({type: 'Any'});
 
+type ApplyLike = Extract<Expr, {type: 'Apply' | 'LiftedTerminal' | 'Param'}>;
+
 export interface Apply {
   type: 'Apply';
   ruleName: string;
-  children: (Apply | Param)[];
+  children: ApplyLike[];
 }
 
-export const apply = (ruleName: string, children: (Apply | Param)[] = []): Apply => ({
+export const apply = (ruleName: string, children: ApplyLike[] = []): Apply => ({
   type: 'Apply',
   ruleName,
   children
@@ -217,12 +219,16 @@ function checkNotNull<T>(x: T, msg = 'unexpected null value'): NonNullable<T> {
   return x;
 }
 
-function checkExprType<T extends ExprType>(
+function checkApplyLike(exp: Expr): ApplyLike {
+  return checkExprType(exp, 'Apply', 'LiftedTerminal', 'Param');
+}
+
+function checkExprType<T extends Expr['type']>(
   exp: Expr,
-  expectedType: T
+  ...types: T[]
 ): Extract<Expr, {type: T}> {
-  if (exp.type !== expectedType) {
-    throw new Error(`Expected expression of type '${expectedType}', but got '${exp.type}'`);
+  if (!types.includes(exp.type as T)) {
+    throw new Error(`Expected one of [${types.join(', ')}], but got '${exp.type}'`);
   }
   return exp as Extract<Expr, {type: T}>;
 }
@@ -261,7 +267,7 @@ export function collectParams(exp: Expr, seen = new Set<number>()): Param[] {
   }
 }
 
-// TODO: Maybe make the types tighter here, to avoid the use checkExprType.
+// TODO: Maybe make the types tighter here, to avoid the use checkApplyLike.
 export function substituteParams<T extends Expr>(
   exp: T,
   actuals: Exclude<Expr, Param>[]
@@ -273,9 +279,9 @@ export function substituteParams<T extends Expr>(
       if (exp.children.length === 0) return exp;
       return apply(
         exp.ruleName,
-        exp.children.map((c): Apply => {
+        exp.children.map((c): ApplyLike => {
           const ans = substituteParams(c, actuals);
-          return checkExprType(ans, 'Apply');
+          return checkApplyLike(ans);
         })
       );
     case 'Dispatch': {

packages/wasm/test/_helpers.js

@@ -2,7 +2,7 @@
 
 import {WasmMatcher} from '@ohm-js/miniohm-js';
 
-import {Compiler} from '../src/index.js';
+import {Compiler} from '../src/Compiler.js';
 
 const DEBUG = process.env.OHM_DEBUG === '1';
 

packages/wasm/test/test-wasm.js

@@ -4,7 +4,7 @@ import * as fc from 'fast-check';
 import * as ohm from 'ohm-js';
 import {performance} from 'perf_hooks';
 
-import {Compiler, ConstantsForTesting as Constants} from '../src/index.js';
+import {Compiler, ConstantsForTesting as Constants} from '../src/Compiler.js';
 import {matchWithInput, unparse, wasmMatcherForGrammar} from './_helpers.js';
 
 const SIZEOF_UINT32 = 4;