Refactor WASM build process to consolidate targets

Signed-off-by: Guan-Ming (Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>

Author: guan404ming

.github/workflows/ci.yml

@@ -40,13 +40,8 @@ jobs:
       - name: Install wasm-pack
         uses: jetli/wasm-pack-action@v0.4.0
 
-      - name: Build WASM (Node.js and Web)
-        run: |
-          wasm-pack build --target nodejs --out-dir ts/wasm
-          wasm-pack build --target web --out-dir ts/wasm-web
-          cp ts/wasm-web/sqlparser_rs_wasm.js ts/wasm/sqlparser_rs_wasm_web.js
-          cp ts/wasm-web/sqlparser_rs_wasm_bg.wasm ts/wasm/sqlparser_rs_wasm_web_bg.wasm
-          rm -rf ts/wasm-web
+      - name: Build WASM
+        run: wasm-pack build --target web --out-dir ts/wasm
 
       - name: Build TypeScript
         working-directory: ts

.gitignore

@@ -7,7 +7,6 @@ node_modules/
 # WASM build output
 /pkg
 /ts/wasm
-/ts/wasm-web
 
 # TypeScript build output
 /ts/dist

scripts/build.sh

@@ -6,35 +6,23 @@ echo "=========================================="
 echo "Building sqlparser-ts npm package"
 echo "=========================================="
 
-# Get the script directory
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
 
 echo ""
 echo "Project directory: $PROJECT_DIR"
 echo ""
 
-# Check for wasm-pack
 if ! command -v wasm-pack &> /dev/null; then
     echo "Error: wasm-pack is not installed."
     echo "Install it with: cargo install wasm-pack"
     echo "Or visit: https://rustwasm.github.io/wasm-pack/installer/"
     exit 1
 fi
 
-# Build WASM for Node.js
-echo "Step 1a: Building WASM module for Node.js..."
+echo "Step 1: Building WASM module..."
 cd "$PROJECT_DIR"
-wasm-pack build --target nodejs --out-dir ts/wasm
-
-# Build WASM for Web (browser)
-echo "Step 1b: Building WASM module for Web (browser)..."
-wasm-pack build --target web --out-dir ts/wasm-web
-
-# Copy web wasm files to wasm directory with _web suffix
-cp ts/wasm-web/sqlparser_rs_wasm.js ts/wasm/sqlparser_rs_wasm_web.js
-cp ts/wasm-web/sqlparser_rs_wasm_bg.wasm ts/wasm/sqlparser_rs_wasm_web_bg.wasm
-rm -rf ts/wasm-web
+wasm-pack build --target web --out-dir ts/wasm
 
 echo ""
 echo "Step 2: Installing npm dependencies..."
@@ -51,10 +39,10 @@ echo "Build complete!"
 echo "=========================================="
 echo ""
 echo "Output files:"
-echo "  - WASM: ts/wasm/"
-echo "  - ESM:  ts/dist/esm/"
-echo "  - CJS:  ts/dist/cts/"
-echo "  - Types: ts/dist/types/"
+echo "  - WASM:  ts/wasm/"
+echo "  - ESM:   ts/dist/index.mjs"
+echo "  - CJS:   ts/dist/index.cjs"
+echo "  - Types: ts/dist/index.d.{mts,cts}"
 echo ""
 echo "To run tests: cd ts && npm test"
 echo "To publish: cd ts && npm publish"

ts/package.json

@@ -20,8 +20,7 @@
   ],
   "scripts": {
     "build": "npm run build:wasm && npm run build:ts",
-    "build:wasm": "cd .. && wasm-pack build --target nodejs --out-dir ts/wasm && rm -f ts/wasm/.gitignore",
-    "build:wasm:web": "cd .. && wasm-pack build --target web --out-dir ts/wasm-web",
+    "build:wasm": "cd .. && wasm-pack build --target web --out-dir ts/wasm && rm -f ts/wasm/.gitignore",
     "build:ts": "tsdown",
     "test": "vitest run",
     "test:watch": "vitest",

ts/src/wasm.ts

@@ -37,27 +37,19 @@ export async function init(): Promise<void> {
 
   if (!initPromise) {
     initPromise = (async () => {
-      if (isBrowser) {
-        try {
-          const wasm = await import(/* @vite-ignore */ '../wasm/sqlparser_rs_wasm_web.js');
-          const wasmBinaryUrl = new URL('../wasm/sqlparser_rs_wasm_web_bg.wasm', import.meta.url);
-
-          if (typeof wasm.default === 'function') {
-            await wasm.default({ module_or_path: wasmBinaryUrl });
-          }
+      try {
+        const wasm = await import(/* @vite-ignore */ '../wasm/sqlparser_rs_wasm.js');
 
-          wasmModule = wasm as WasmModule;
-        } catch (error) {
-          throw new WasmInitError(
-            `Failed to load WASM module in browser: ${error instanceof Error ? error.message : String(error)}`
-          );
+        if (isBrowser) {
+          const wasmUrl = new URL('../wasm/sqlparser_rs_wasm_bg.wasm', import.meta.url);
+          await wasm.default({ module_or_path: wasmUrl });
+        } else {
+          const { readFile } = await import(/* @vite-ignore */ 'node:fs/promises');
+          const wasmPath = new URL('../wasm/sqlparser_rs_wasm_bg.wasm', import.meta.url);
+          const bytes = await readFile(wasmPath);
+          await wasm.default({ module_or_path: bytes });
         }
-        return;
-      }
 
-      // Node.js
-      try {
-        const wasm = await import(/* @vite-ignore */ '../wasm/sqlparser_rs_wasm.js');
         wasmModule = wasm as WasmModule;
       } catch (error) {
         throw new WasmInitError(