vitest-pool-assemblyscript 0.2.0 → 0.2.2

package/package.json

@@ -1,7 +1,23 @@
 {
   "name": "vitest-pool-assemblyscript",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "AssemblyScript testing with Vitest - Simple, fast, familiar, AS-native, with full coverage output",
+  "author": "Matt Ritter <matthew.d.ritter@gmail.com>",
+  "license": "MIT",
+  "keywords": [
+    "assemblyscript",
+    "vitest",
+    "unit test",
+    "unit testing",
+    "webassembly",
+    "wasm",
+    "testing",
+    "testing framework",
+    "test runner",
+    "compile-to-wasm",
+    "custom pool",
+    "vitest plugin"
+  ],
   "type": "module",
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.mts",
@@ -67,7 +83,7 @@
     "//------------ Native Addon ------------": "",
     "setup-binaryen": "node scripts/setup-binaryen.js",
     "build:native": "node-gyp rebuild",
-    "build:prebuilds": "prebuildify --napi --strip --tag-libc",
+    "build:prebuild": "prebuildify --napi --strip --tag-libc",
     "install": "node scripts/install.js"
   },
   "dependencies": {

package/scripts/setup-binaryen.js

@@ -1,4 +1,5 @@
 import fs from 'fs';
+import os from 'os';
 import path from 'path';
 import https from 'https';
 import { execSync } from 'child_process';
@@ -9,7 +10,9 @@ const BINARYEN_VERSION = fs.readFileSync(
   'utf8'
 ).trim();
 
-// Detect platform for prebuilt binaries
+const IS_MACOS = process.platform === 'darwin';
+
+// Detect platform for prebuilt binaries (non-macOS only)
 function detectPlatform() {
   const platform = process.platform;
   const arch = process.arch;
@@ -31,6 +34,36 @@ function detectPlatform() {
   }
 }
 
+// Map Node.js arch to CMake OSX architecture identifier
+function getCmakeOsxArch() {
+  if (process.arch === 'arm64') return 'arm64';
+  if (process.arch === 'x64') return 'x86_64';
+  throw new Error(`Unsupported macOS architecture: ${process.arch}`);
+}
+
+// Run a command quietly, but print its output if it fails
+function execQuiet(command) {
+  try {
+    execSync(command, { stdio: 'pipe' });
+  } catch (err) {
+    const output = err.stderr?.toString() || err.stdout?.toString() || '';
+    if (output) {
+      console.error(output);
+    }
+    throw err;
+  }
+}
+
+// Check if a command is available on PATH
+function isCommandAvailable(command) {
+  try {
+    execSync(`which ${command}`, { stdio: 'pipe' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 const PLATFORM = detectPlatform();
 const PREBUILT_URL = `https://github.com/WebAssembly/binaryen/releases/download/${BINARYEN_VERSION}/binaryen-${BINARYEN_VERSION}-${PLATFORM}.tar.gz`;
 const SOURCE_URL = `https://github.com/WebAssembly/binaryen/archive/refs/tags/${BINARYEN_VERSION}.tar.gz`;
@@ -42,88 +75,162 @@ const TEMP_DIR = path.join(THIRD_PARTY_DIR, 'binaryen-temp');
 
 console.log(`Setting up Binaryen ${BINARYEN_VERSION}...`);
 console.log(`Platform: ${PLATFORM}`);
+
+if (IS_MACOS) {
+  console.log('macOS detected: will build static library from source');
+}
+
 console.log('');
 
-// Step 1: Download prebuilt binaries
-console.log('Step 1: Downloading prebuilt binaries...');
-console.log(`URL: ${PREBUILT_URL}`);
-downloadFile(PREBUILT_URL, PREBUILT_ARCHIVE, () => {
-  console.log('✓ Prebuilt binaries downloaded');
-  console.log('');
+if (IS_MACOS) {
+  // macOS: Build Binaryen from source to produce libbinaryen.a
+  // The official macOS prebuilt release only ships libbinaryen.dylib (shared),
+  // which cannot be statically linked into our .node addon. Building from source
+  // with BUILD_STATIC_LIB=ON produces the .a file our binding.gyp expects.
+  setupMacOS();
+} else {
+  // Linux/Windows: Download prebuilt static library + source headers
+  setupWithPrebuilt();
+}
 
-  // Step 2: Download source code (for C++ headers)
-  console.log('Step 2: Downloading source code for headers...');
+// ---------------------------------------------------------------------------
+// macOS: build from source
+// ---------------------------------------------------------------------------
+
+function setupMacOS() {
+  if (!isCommandAvailable('cmake')) {
+    console.error('Error: cmake is required to build Binaryen on macOS but was not found.');
+    console.error('Install it with: brew install cmake');
+    process.exit(1);
+  }
+
+  console.log('Step 1: Downloading source code...');
   console.log(`URL: ${SOURCE_URL}`);
   downloadFile(SOURCE_URL, SOURCE_ARCHIVE, () => {
     console.log('✓ Source code downloaded');
     console.log('');
-
-    extractAndCombine();
+    extractAndBuildFromSource();
   });
-});
+}
 
-function downloadFile(url, dest, callback) {
-  const file = fs.createWriteStream(dest);
+function extractAndBuildFromSource() {
+  console.log('Step 2: Extracting source code...');
 
-  const handleResponse = (response) => {
-    response.pipe(file);
-    file.on('finish', () => {
-      file.close(() => {
-        response.destroy();
-        callback();
-      });
-    });
-    file.on('error', (err) => {
-      response.destroy();
-      if (fs.existsSync(dest)) {
-        fs.unlinkSync(dest);
-      }
-      console.error(`File write failed: ${err.message}`);
-      process.exit(1);
-    });
-  };
+  ensureCleanDirs();
 
-  const request = https.get(url, (response) => {
-    if (response.statusCode === 302 || response.statusCode === 301) {
-      // Follow redirect
-      response.destroy();
-      const redirectRequest = https.get(response.headers.location, handleResponse);
-      redirectRequest.on('error', (err) => {
-        if (fs.existsSync(dest)) {
-          fs.unlinkSync(dest);
-        }
-        console.error(`Download failed: ${err.message}`);
-        process.exit(1);
-      });
-    } else {
-      handleResponse(response);
+  try {
+    execSync(`tar -xzf "${SOURCE_ARCHIVE}" -C "${TEMP_DIR}"`, { stdio: 'pipe' });
+    const sourceDir = path.join(TEMP_DIR, `binaryen-${BINARYEN_VERSION}`);
+
+    if (!fs.existsSync(sourceDir)) {
+      throw new Error(`Expected source directory not found: ${sourceDir}`);
     }
-  });
 
-  request.on('error', (err) => {
-    if (fs.existsSync(dest)) {
-      fs.unlinkSync(dest);
+    console.log('✓ Source code extracted');
+    console.log('');
+
+    // Build static library with cmake
+    console.log('Step 3: Building static library with cmake...');
+
+    const buildDir = path.join(sourceDir, 'build');
+    const osxArch = getCmakeOsxArch();
+    const cpuCount = os.cpus().length;
+    const useNinja = isCommandAvailable('ninja');
+    const generatorArgs = useNinja ? ['-G', 'Ninja'] : [];
+
+    console.log(`  Architecture: ${osxArch}`);
+    console.log(`  Generator: ${useNinja ? 'Ninja' : 'Unix Makefiles (default)'}`);
+    console.log(`  Parallel jobs: ${cpuCount}`);
+    console.log('');
+
+    // Configure
+    console.log('  Configuring...');
+    const configureArgs = [
+      'cmake',
+      '-S', sourceDir,
+      '-B', buildDir,
+      ...generatorArgs,
+      '-DCMAKE_BUILD_TYPE=Release',
+      '-DBUILD_STATIC_LIB=ON',
+      '-DBUILD_TESTS=OFF',
+      '-DBUILD_TOOLS=OFF',
+      '-DENABLE_WERROR=OFF',
+      `-DCMAKE_OSX_ARCHITECTURES=${osxArch}`,
+    ];
+    execQuiet(configureArgs.join(' '));
+    console.log('  ✓ Configure complete');
+
+    // Build (only the binaryen library target, not CLI tools)
+    console.log('  Building (this may take several minutes)...');
+    execQuiet(`cmake --build "${buildDir}" --target binaryen -j${cpuCount}`);
+    console.log('  ✓ Build complete');
+    console.log('');
+
+    // Assemble third_party/binaryen/ with lib/ and src/
+    console.log('Step 4: Installing to third_party/binaryen/...');
+
+    fs.mkdirSync(BINARYEN_DIR, { recursive: true });
+
+    // Copy static library
+    const builtLib = path.join(buildDir, 'lib', 'libbinaryen.a');
+    if (!fs.existsSync(builtLib)) {
+      throw new Error(`Built static library not found at ${builtLib}`);
     }
-    console.error(`Download failed: ${err.message}`);
+    const destLibDir = path.join(BINARYEN_DIR, 'lib');
+    fs.mkdirSync(destLibDir, { recursive: true });
+    fs.cpSync(builtLib, path.join(destLibDir, 'libbinaryen.a'));
+    console.log('  ✓ Copied libbinaryen.a');
+
+    // Copy C++ headers from source
+    const sourceSrcDir = path.join(sourceDir, 'src');
+    const destSrcDir = path.join(BINARYEN_DIR, 'src');
+    if (fs.existsSync(sourceSrcDir)) {
+      fs.cpSync(sourceSrcDir, destSrcDir, { recursive: true });
+      console.log('  ✓ Copied C++ headers');
+    } else {
+      throw new Error('Source src/ directory not found');
+    }
+
+    // Clean up
+    console.log('  Cleaning up...');
+    fs.rmSync(TEMP_DIR, { recursive: true, force: true });
+    fs.unlinkSync(SOURCE_ARCHIVE);
+
+    printResult();
+  } catch (err) {
+    console.error('macOS source build failed:', err.message);
+    console.error('Ensure cmake is installed: brew install cmake');
+    console.error('For faster builds, also install ninja: brew install ninja');
     process.exit(1);
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Linux/Windows: download prebuilt static library + source headers
+// ---------------------------------------------------------------------------
+
+function setupWithPrebuilt() {
+  console.log('Step 1: Downloading prebuilt binaries...');
+  console.log(`URL: ${PREBUILT_URL}`);
+  downloadFile(PREBUILT_URL, PREBUILT_ARCHIVE, () => {
+    console.log('✓ Prebuilt binaries downloaded');
+    console.log('');
+
+    console.log('Step 2: Downloading source code for headers...');
+    console.log(`URL: ${SOURCE_URL}`);
+    downloadFile(SOURCE_URL, SOURCE_ARCHIVE, () => {
+      console.log('✓ Source code downloaded');
+      console.log('');
+
+      extractAndCombine();
+    });
   });
 }
 
 function extractAndCombine() {
   console.log('Step 3: Extracting and combining...');
 
-  // Create directories
-  if (!fs.existsSync(THIRD_PARTY_DIR)) {
-    fs.mkdirSync(THIRD_PARTY_DIR, { recursive: true });
-  }
-  if (!fs.existsSync(TEMP_DIR)) {
-    fs.mkdirSync(TEMP_DIR, { recursive: true });
-  }
-
-  // Remove existing binaryen directory if it exists
-  if (fs.existsSync(BINARYEN_DIR)) {
-    fs.rmSync(BINARYEN_DIR, { recursive: true, force: true });
-  }
+  ensureCleanDirs();
 
   try {
     // Extract prebuilt binaries
@@ -154,26 +261,93 @@ function extractAndCombine() {
     fs.unlinkSync(PREBUILT_ARCHIVE);
     fs.unlinkSync(SOURCE_ARCHIVE);
 
-    console.log('');
-    console.log(`✓ Binaryen ${BINARYEN_VERSION} installed to third_party/binaryen`);
-    console.log('');
-    console.log('Contents:');
-    const contents = fs.readdirSync(BINARYEN_DIR);
-    console.log(contents.map(f => `  ${f}`).join('\n'));
-
-    const libDir = path.join(BINARYEN_DIR, 'lib');
-    if (fs.existsSync(libDir)) {
-      console.log('');
-      console.log('Library files:');
-      const libFiles = fs.readdirSync(libDir);
-      console.log(libFiles.map(f => `  ${f}`).join('\n'));
-    }
-
-    console.log('');
-    console.log('Setup complete!');
+    printResult();
   } catch (err) {
     console.error('Extraction/combination failed:', err.message);
     console.error('Make sure tar is available on your system.');
     process.exit(1);
   }
 }
+
+// ---------------------------------------------------------------------------
+// Shared helpers
+// ---------------------------------------------------------------------------
+
+function ensureCleanDirs() {
+  if (!fs.existsSync(THIRD_PARTY_DIR)) {
+    fs.mkdirSync(THIRD_PARTY_DIR, { recursive: true });
+  }
+  if (!fs.existsSync(TEMP_DIR)) {
+    fs.mkdirSync(TEMP_DIR, { recursive: true });
+  }
+  if (fs.existsSync(BINARYEN_DIR)) {
+    fs.rmSync(BINARYEN_DIR, { recursive: true, force: true });
+  }
+}
+
+function printResult() {
+  console.log('');
+  console.log(`✓ Binaryen ${BINARYEN_VERSION} installed to third_party/binaryen`);
+  console.log('');
+  console.log('Contents:');
+  const contents = fs.readdirSync(BINARYEN_DIR);
+  console.log(contents.map(f => `  ${f}`).join('\n'));
+
+  const libDir = path.join(BINARYEN_DIR, 'lib');
+  if (fs.existsSync(libDir)) {
+    console.log('');
+    console.log('Library files:');
+    const libFiles = fs.readdirSync(libDir);
+    console.log(libFiles.map(f => `  ${f}`).join('\n'));
+  }
+
+  console.log('');
+  console.log('Setup complete!');
+}
+
+function downloadFile(url, dest, callback) {
+  const file = fs.createWriteStream(dest);
+
+  const handleResponse = (response) => {
+    response.pipe(file);
+    file.on('finish', () => {
+      file.close(() => {
+        response.destroy();
+        callback();
+      });
+    });
+    file.on('error', (err) => {
+      response.destroy();
+      if (fs.existsSync(dest)) {
+        fs.unlinkSync(dest);
+      }
+      console.error(`File write failed: ${err.message}`);
+      process.exit(1);
+    });
+  };
+
+  const request = https.get(url, (response) => {
+    if (response.statusCode === 302 || response.statusCode === 301) {
+      // Follow redirect
+      response.destroy();
+      const redirectRequest = https.get(response.headers.location, handleResponse);
+      redirectRequest.on('error', (err) => {
+        if (fs.existsSync(dest)) {
+          fs.unlinkSync(dest);
+        }
+        console.error(`Download failed: ${err.message}`);
+        process.exit(1);
+      });
+    } else {
+      handleResponse(response);
+    }
+  });
+
+  request.on('error', (err) => {
+    if (fs.existsSync(dest)) {
+      fs.unlinkSync(dest);
+    }
+    console.error(`Download failed: ${err.message}`);
+    process.exit(1);
+  });
+}

package/src/native-instrumentation/addon.cpp

@@ -258,7 +258,7 @@ SourceDebugLocation getRepresentativeLocationInBlockBody(
   Block* blockBody,
   const std::unordered_map<wasm::Expression*, std::optional<wasm::Function::DebugLocation>> debugLocations
 ) {
-  SourceDebugLocation repLoc = { exists: false, fileIndex: 0, lineNumber: 0, columnNumber: 0 };
+  SourceDebugLocation repLoc = { .exists = false, .fileIndex = 0, .lineNumber = 0, .columnNumber = 0 };
 
   if (DEBUG) {
     std::cout << LOG_PREFIX << " -     Checking func Block body: " << blockBody->list.size() << " body expressions" << std::endl;
@@ -296,7 +296,7 @@ SourceDebugLocation getRepresentativeLocationInBlockBody(
 }
 
 SourceDebugLocation getRepresentativeLocation(Function* func) {
-  SourceDebugLocation repLoc = { exists: false, fileIndex: 0, lineNumber: 0, columnNumber: 0 };
+  SourceDebugLocation repLoc = { .exists = false, .fileIndex = 0, .lineNumber = 0, .columnNumber = 0 };
   
   // Get body expression debug location
   Expression* body = func->body;

package/dist/pool-runner-init-CEwLyNI3.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pool-runner-init-CEwLyNI3.d.mts","names":[],"sources":["../src/pool/pool-runner-init.ts"],"mappings":";;;;iBAUgB,wBAAA,CAAyB,eAAA,GAAkB,yBAAA,GAA4B,qBAAA"}

package/dist/types-8KKo9Hbf.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types-8KKo9Hbf.d.mts","names":[],"sources":["../src/types/types.ts"],"mappings":";;;;;;;;;;AAqHA;;UA3DiB,yBAAA;EA6DK;EA3DpB,KAAA;;;;;;;;;;EAUA,WAAA;EAuDF;;;;;;;EA9CE,YAAA;EAEA,0BAAA;EACA,sBAAA;EAEA,sBAAA;EACA,kBAAA;EAEA,kBAAA;EAEA,kBAAA;AAAA;;;;UAMe,qBAAA;EACf,QAAA;EACA,oBAAA;EAsGA;AAGF;;;;;;;EA/FE,qBAAA;;;;;;EAOA,qBAAA;AAAA;AAAA,UAGe,sBAAA;EACf,MAAA,EAAQ,WAAA,CAAY,MAAA;EACpB,MAAA,EAAQ,WAAA,CAAY,MAAA;EACpB,KAAA;IACE,UAAA,GAAa,SAAA;EAAA;AAAA;AAAA,KAIL,kBAAA,IAAsB,UAAA,EAAY,sBAAA,KAA2B,WAAA,CAAY,OAAA;AAAA,UAqEpE,6BAAA;EACf,gBAAA;EACA,WAAA;EACA,sBAAA,GAAyB,sBAAA;EACzB,WAAA;EACA,UAAA;AAAA;AAAA,UAGe,4BAAA;EACf,MAAA,EAAQ,UAAA;EACR,SAAA;EACA,SAAA,GAAY,eAAA;EACZ,cAAA;EACA,aAAA;AAAA;AAAA,UAGe,sBAAA;;EAEf,qBAAA;EACA,yBAAA;EACA,sBAAA;EACA,sBAAA;AAAA;;;;;;AAiZF;UAxXiB,cAAA;;EAEf,QAAA;EACA,IAAA;EACA,MAAA;AAAA;;;;UAoEe,mBAAA;;EAEf,gBAAA;;EAEA,qBAAA;AAAA;;;;;;;UASe,mBAAA;EAyUjB;EAvUE,IAAA;;EAEA,QAAA,GAAW,cAAA;;EAEX,QAAA;;EAEA,WAAA;;;;;EAKA,mBAAA;AAAA;;;;;;;UASe,mBAAA;;EAEf,KAAA;EAwTsB;EAtTtB,iBAAA;;EAEA,QAAA,EAAU,mBAAA;;;;;EAKV,mBAAA;AAAA;;;;UAMe,iBAAA;;EAEf,SAAA;;EAEA,IAAA;;;;;EAKA,sBAAA,EAAwB,cAAA;;EAExB,mBAAA;;EAEA,WAAA,EAAa,mBAAA;;EAEb,WAAA,EAAa,mBAAA;AAAA;;;;;;;UASE,eAAA;;EAEf,gBAAA;;;;;EAKA,0BAAA,EAA4B,MAAA,SAAe,MAAA,SAAe,iBAAA;EAE1D,yBAAA;AAAA;AAAA,UA2Ne,eAAA;EACf,QAAA;EACA,MAAA,EAAQ,UAAA;EACR,SAAA;EACA,SAAA,GAAY,eAAA;AAAA;AAAA,UASG,UAAA;EACf,IAAA,EAAM,IAAA;EACN,WAAA,GAAc,eAAA;AAAA;AAAA,UAGC,yBAAA;EACf,aAAA;EACA,QAAA;EACA,IAAA,EAAM,WAAA;EACN,IAAA,EAAM,IAAA;EACN,MAAA,EAAQ,gBAAA;EACR,kBAAA;AAAA;AAAA,UAGe,YAAA;EACf,aAAA;EACA,QAAA;EACA,IAAA,EAAM,WAAA;EACN,IAAA,EAAM,IAAA;EACN,WAAA,EAAa,eAAA;EACb,MAAA,EAAQ,gBAAA;EACR,kBAAA;EACA,YAAA,GAAe,IAAA;AAAA;AAAA,UAGA,sBAAA;EACf,aAAA;EACA,IAAA,EAAM,WAAA;EACN,IAAA,EAAM,IAAA;EACN,MAAA,EAAQ,gBAAA;EACR,kBAAA;EACA,YAAA,GAAe,IAAA;EACf,mBAAA,GAAsB,eAAA;AAAA"}