@W-22185056: Add BUILD_VARIANT concept with single "default" variant

src/scripts/build.ts

@@ -1,15 +1,29 @@
 /* eslint-disable no-console */
 
-import { build } from 'esbuild';
+import { build, BuildOptions } from 'esbuild';
 import { chmod, mkdir, rm } from 'fs/promises';
 
+import { GlobalIdentifierName, globalIdentifiers } from './globalIdentifiers';
+import { isVariant, variants } from './variants';
+
 const dev = process.argv.includes('--dev');
+const variant = process.argv.includes('--variant')
+  ? process.argv[process.argv.indexOf('--variant') + 1]
+  : 'default';
+
+if (!isVariant(variant)) {
+  throw new Error(`Invalid variant: ${variant}. Expected one of: ${variants.join(', ')}`);
+}
+
+const globalValues: Record<GlobalIdentifierName, string> = {
+  BUILD_VARIANT: variant,
+};
 
 (async () => {
   await rm('./build', { recursive: true, force: true });
 
-  console.log('🏗️ Building...');
-  const result = await build({
+  console.log(`🏗️ Building ${variant} variant...`);
+  const buildOptions: BuildOptions = {
     entryPoints: ['./src/index.ts'],
     bundle: true,
     platform: 'node',
@@ -22,7 +36,28 @@ const dev = process.argv.includes('--dev');
       'empty-import-meta': 'silent',
     },
     outfile: './build/index.js',
-  });
+    // https://esbuild.github.io/api/#define
+    define: {
+      // 'import.meta.env.BUILD_VARIANT': JSON.stringify(env.BUILD_VARIANT),
+      ...globalIdentifiers.reduce<Record<`import.meta.env.${string}`, string>>(
+        (acc, { name, defaultValue }) => {
+          acc[`import.meta.env.${name}`] = JSON.stringify(globalValues[name] ?? defaultValue);
+          return acc;
+        },
+        {},
+      ),
+    },
+    // must be last so that the action can override previous build options
+    ...globalIdentifiers.reduce((acc, { name, defaultValue, action }) => {
+      return { ...acc, ...action(globalValues[name] ?? defaultValue) };
+    }, {}),
+  };
+
+  if (!buildOptions.outfile) {
+    throw new Error('outfile build option must be specified');
+  }
+
+  const result = await build(buildOptions);
 
   for (const error of result.errors) {
     console.log(`❌ ${error.text}`);
@@ -53,5 +88,5 @@ const dev = process.argv.includes('--dev');
     console.log(`⚠️ ${warning.text}`);
   }
 
-  await chmod('./build/index.js', '755');
+  await chmod(buildOptions.outfile, '755');
 })();

src/scripts/createClaudeMcpBundleManifest.ts

@@ -11,7 +11,6 @@ import packageJson from '../../package.json';
 import { ProcessEnvEx } from '../../types/process-env.js';
 import { webToolNames } from '../tools/web/toolName.js';
 
-// @ts-expect-error - import.meta is not allowed in CommonJS output, but this file is built using esbuild as ESM
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 

src/scripts/globalIdentifiers.ts

@@ -0,0 +1,32 @@
+import { BuildOptions } from 'esbuild';
+
+import { Variant } from './variants';
+
+export type GlobalIdentifierName = 'BUILD_VARIANT';
+
+type GlobalIdentifier = {
+  name: GlobalIdentifierName;
+  defaultValue: string;
+  action: (value: string) => BuildOptions | undefined;
+};
+
+export const globalIdentifiers: ReadonlyArray<GlobalIdentifier> = [
+  {
+    name: 'BUILD_VARIANT',
+    defaultValue: 'default' satisfies Variant,
+    action: (value: string): BuildOptions | undefined => {
+      if (value === 'default') {
+        return {
+          entryPoints: ['./src/index.ts'],
+          outfile: './build/index.js',
+        };
+      }
+
+      // variant "foo" has an entry point of src/index.foo.ts and an outfile of build/index.foo.js
+      return {
+        entryPoints: [`./src/index.${value}.ts`],
+        outfile: `./build/index.${value}.js`,
+      };
+    },
+  },
+] as const;

src/scripts/variants.ts

@@ -0,0 +1,5 @@
+export const variants = ['default'] as const;
+export type Variant = (typeof variants)[number];
+export function isVariant(value: unknown): value is Variant {
+  return variants.some((variant) => variant === value);
+}

tests/eval/base.ts

@@ -7,7 +7,7 @@ import {
   StreamedRunResult,
   withTrace,
 } from '@openai/agents';
-import { OpenAI } from 'openai/client.js';
+import OpenAI from 'openai';
 import { Err, Ok, Result } from 'ts-results-es';
 import z from 'zod';
 

tsconfig.json

@@ -1,8 +1,9 @@
 {
   "compilerOptions": {
     "target": "ES2022",
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "noEmit": true,
     "outDir": "./build",
     "rootDir": "./",
     "strict": true,

types/import-meta.d.ts

@@ -0,0 +1,5 @@
+interface ImportMeta {
+  readonly env: {
+    readonly BUILD_VARIANT: string;
+  };
+}