@opendatacapture/instrument-bundler 2.1.4 → 2.2.1

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@opendatacapture/instrument-bundler",
   "type": "module",
-  "version": "2.1.4",
+  "version": "2.2.1",
+  "sideEffects": [
+    "**/cli.ts"
+  ],
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
@@ -31,16 +34,15 @@
     "esbuild-wasm": "0.23.x",
     "glob": "^11.1.0",
     "slashes": "^3.0.12",
-    "type-fest": "npm:type-fest__4.x@4.23.0",
-    "zod": "npm:zod__3.x@3.25.36",
+    "@opendatacapture/runtime-internal": "0.0.0",
     "ts-pattern": "npm:ts-pattern__5.x@5.3.1",
-    "@opendatacapture/runtime-internal": "0.0.0"
+    "type-fest": "npm:type-fest__4.x@4.23.0",
+    "zod": "npm:zod__3.x@3.25.36"
   },
   "devDependencies": {
-    "@opendatacapture/instrument-stubs": "0.0.0",
-    "@opendatacapture/runtime-v1": "2.1.4",
-    "react-dom": "npm:react-dom__19.x@19.1.0",
-    "react": "npm:react__19.x@19.1.0"
+    "react": "npm:react__19.x@19.1.0",
+    "@opendatacapture/runtime-v1": "2.2.1",
+    "react-dom": "npm:react-dom__19.x@19.1.0"
   },
   "scripts": {
     "format": "prettier --write src",

package/src/build.ts

@@ -9,7 +9,37 @@ import * as esbuild from './vendor/esbuild.js';
 
 import type { BundlerInput } from './schemas.js';
 import type { BuildOutput } from './types.js';
-import type { BuildResult } from './vendor/esbuild.js';
+import type { BuildFailure, BuildResult } from './vendor/esbuild.js';
+
+const DEFAULT_REACT_PACKAGE = 'react@19.x';
+
+const REACT_PACKAGE_PATTERN = /['"]\/runtime\/v1\/(react@[^'"/]+)/g;
+
+/**
+ * JSX compiles to the JSX runtime of one react, and elements of one major are not renderable by
+ * another, so the runtime has to be the react the source itself imports rather than a fixed version.
+ */
+function resolveJsxImportSource(inputs: BundlerInput[]): string {
+  const packages = new Set<string>();
+  for (const { content } of inputs) {
+    if (typeof content !== 'string') {
+      continue;
+    }
+    for (const [, name] of content.matchAll(REACT_PACKAGE_PATTERN)) {
+      packages.add(name!);
+    }
+  }
+  if (packages.size > 1) {
+    throw new InstrumentBundlerError(
+      `Cannot resolve the JSX runtime: expected at most one version of react, found ${[...packages].join(', ')}`
+    );
+  }
+  return `/runtime/v1/${packages.values().next().value ?? DEFAULT_REACT_PACKAGE}`;
+}
+
+function describeError(err: unknown): string {
+  return err instanceof Error ? `${err.name}: ${err.message}` : `${typeof err}: ${String(err)}`;
+}
 
 function parseBuildResult(result: BuildResult): BuildOutput {
   const cssOutput = result.outputFiles?.find((output) => output.path.endsWith('bundle.css'));
@@ -41,6 +71,8 @@ export async function build({
   logLevel?: LogLevel;
 }): Promise<BuildOutput> {
   const index = resolveIndexInput(inputs);
+  // outside the try, whose catch rewrites anything it sees into an esbuild failure
+  const jsxImportSource = resolveJsxImportSource(inputs);
   let result: BuildResult;
   try {
     result = await esbuild.build({
@@ -48,7 +80,7 @@ export async function build({
       charset: 'ascii',
       format: 'esm',
       jsx: 'automatic',
-      jsxImportSource: '/runtime/v1/react@19.x',
+      jsxImportSource,
       keepNames: true,
       logLevel,
       metafile: true,
@@ -67,9 +99,12 @@ export async function build({
   } catch (err) {
     const parseResult = await $BuildFailure.safeParseAsync(err);
     if (parseResult.success) {
-      throw new InstrumentBundlerError('Unknown Error', { cause: err });
+      // the original error, rather than the parsed copy, so that `cause instanceof Error` holds downstream
+      throw new InstrumentBundlerError('Failed to Compile', { cause: err as BuildFailure, kind: 'ESBUILD_FAILURE' });
     }
-    throw new InstrumentBundlerError('Failed to Compile', { cause: parseResult.error, kind: 'ESBUILD_FAILURE' });
+    // anything esbuild did not report as a compilation failure is a fault in the bundler itself, not in the
+    // instrument, so name it here rather than leaving the reader with 'Unknown Error' and a stack
+    throw new InstrumentBundlerError(`Unexpected error while invoking esbuild: ${describeError(err)}`, { cause: err });
   }
   return parseBuildResult(result);
 }

package/src/vendor/esbuild.ts

@@ -1,5 +1,3 @@
-/* eslint-disable no-var */
-
 declare module 'esbuild' {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/consistent-type-definitions
   export interface BuildResult<ProvidedOptions extends BuildOptions = BuildOptions> {
@@ -14,11 +12,10 @@ declare module 'esbuild-wasm' {
   }
 }
 
-if (typeof window === 'undefined') {
-  var { build, transform } = await import('esbuild');
-} else {
-  var { build, transform } = await import('esbuild-wasm');
-}
+// The bindings must be initialized by their own declaration, not by a detached `if`/`else`.
+// This package declares `sideEffects: ['**/cli.ts']`, so a bundler is free to drop a
+// standalone statement here, which silently leaves `build` undeclared in the output.
+const { build, transform } = typeof window === 'undefined' ? await import('esbuild') : await import('esbuild-wasm');
 
 export { build, transform };
 export type { BuildFailure, BuildResult, Loader, Location, Message, Plugin } from 'esbuild';