@tscircuit/autorouting-dataset-01 1.0.26 → 1.0.27

package/dist/cli/index.js

@@ -5,12 +5,119 @@ import { Command } from "commander";
 
 // lib/cli/run/register.ts
 import { access, mkdir, writeFile } from "fs/promises";
-import path3 from "path";
+import path5 from "path";
 import { fileURLToPath } from "url";
 import kleur from "kleur";
 
+// lib/cli/bundleAutorouter.ts
+import path from "path";
+var bundleAutorouter = async (autorouterPath, solverName) => {
+  const wrapperCode = `
+import * as AutorouterModule from "${autorouterPath}";
+
+// Find the solver constructor
+const solverName = "${solverName}";
+let SolverConstructor = null;
+
+// Check direct export by name
+if (AutorouterModule[solverName]) {
+  SolverConstructor = AutorouterModule[solverName];
+}
+// Check default export
+else if (AutorouterModule.default) {
+  SolverConstructor = AutorouterModule.default;
+}
+
+// Check SOLVER_CONSTRUCTOR_LIST array
+if (!SolverConstructor && AutorouterModule.SOLVER_CONSTRUCTOR_LIST) {
+  for (const ctor of AutorouterModule.SOLVER_CONSTRUCTOR_LIST) {
+    if (ctor.name === solverName) {
+      SolverConstructor = ctor;
+      break;
+    }
+  }
+}
+
+// Check solverDisplayNameByConstructor map (reverse lookup)
+if (!SolverConstructor && AutorouterModule.solverDisplayNameByConstructor) {
+  for (const [ctor, displayName] of AutorouterModule.solverDisplayNameByConstructor) {
+    if (displayName === solverName) {
+      SolverConstructor = ctor;
+      break;
+    }
+  }
+}
+
+// Fallback: check if any export looks like a solver class
+if (!SolverConstructor) {
+  for (const [key, value] of Object.entries(AutorouterModule)) {
+    if (typeof value === 'function' && value.prototype && key.includes('Pipeline')) {
+      SolverConstructor = value;
+      break;
+    }
+  }
+}
+
+// Export as ES module
+export { SolverConstructor, solverName };
+export default SolverConstructor;
+`;
+  const tempDir = path.dirname(autorouterPath);
+  const wrapperPath = path.join(tempDir, "__autorouter_wrapper__.ts");
+  await Bun.write(wrapperPath, wrapperCode);
+  try {
+    const result = await Bun.build({
+      entrypoints: [wrapperPath],
+      target: "browser",
+      minify: false,
+      sourcemap: "none",
+      external: []
+    });
+    if (!result.success) {
+      const errors = result.logs.map((log) => log.message).join("\n");
+      throw new Error(`Bundle failed: ${errors}`);
+    }
+    const output = result.outputs[0];
+    const bundleText = await output.text();
+    return bundleText;
+  } finally {
+    try {
+      ;
+      await Bun.file(wrapperPath).exists() && (await import("fs/promises")).unlink(wrapperPath);
+    } catch {
+    }
+  }
+};
+
 // lib/cli/loadUserAutorouter.ts
+import { readFileSync } from "fs";
+import path2 from "path";
 import { pathToFileURL } from "url";
+var AUTOROUTER_PACKAGE = "@tscircuit/capacity-autorouter";
+var detectPackageInfo = (autorouterPath) => {
+  try {
+    let searchDir = path2.dirname(autorouterPath);
+    while (searchDir !== path2.dirname(searchDir)) {
+      try {
+        const packageDir = path2.join(
+          searchDir,
+          "node_modules",
+          AUTOROUTER_PACKAGE
+        );
+        const pkgJsonPath = path2.join(packageDir, "package.json");
+        const pkgJson = JSON.parse(readFileSync(pkgJsonPath, "utf-8"));
+        return {
+          name: AUTOROUTER_PACKAGE,
+          version: pkgJson.version
+        };
+      } catch {
+      }
+      searchDir = path2.dirname(searchDir);
+    }
+  } catch {
+  }
+  return void 0;
+};
 var loadUserAutorouter = async (autorouterPath, requestedSolverName) => {
   let exports;
   try {
@@ -22,6 +129,7 @@ var loadUserAutorouter = async (autorouterPath, requestedSolverName) => {
       `Failed to import autorouter from "${autorouterPath}": ${error.message}`
     );
   }
+  let packageInfo;
   let displayNameMap = null;
   for (const [, exportValue] of Object.entries(exports)) {
     if (exportValue instanceof Map) {
@@ -79,9 +187,11 @@ var loadUserAutorouter = async (autorouterPath, requestedSolverName) => {
         `Solver "${requestedSolverName}" not found in "${autorouterPath}". Available solvers: ${availableNames.join(", ") || "(none)"}`
       );
     }
+    packageInfo = detectPackageInfo(autorouterPath);
     return {
       solverConstructor: requestedExport.value,
-      solverName: requestedSolverName
+      solverName: requestedSolverName,
+      packageInfo
     };
   }
   if (pipelineExports.length === 0) {
@@ -104,25 +214,27 @@ var loadUserAutorouter = async (autorouterPath, requestedSolverName) => {
       `Export "${preferredExport.name}" is not a class or function. Expected a solver constructor.`
     );
   }
+  packageInfo = detectPackageInfo(autorouterPath);
   return {
     solverConstructor,
-    solverName: preferredExport.name
+    solverName: preferredExport.name,
+    packageInfo
   };
 };
 
 // scripts/run-benchmark/buildBenchmarkDetailsJson.ts
-import path from "path";
+import path3 from "path";
 var buildBenchmarkDetailsJson = (inputs) => {
   const { scenarioResultList, scenarioList } = inputs;
   const detailsByScenarioPath = {};
   const simpleRouteJsonByScenarioPath = new Map(
     scenarioList.map((scenario) => [
-      path.basename(scenario.simpleRouteJsonPath),
+      path3.basename(scenario.simpleRouteJsonPath),
       scenario.simpleRouteJson
     ])
   );
   for (const scenarioResult of scenarioResultList) {
-    const scenarioFileName = path.basename(scenarioResult.simpleRouteJsonPath);
+    const scenarioFileName = path3.basename(scenarioResult.simpleRouteJsonPath);
     const simpleRouteJson = simpleRouteJsonByScenarioPath.get(scenarioFileName);
     if (!simpleRouteJson) {
       continue;
@@ -267,7 +379,7 @@ var generateChartScripts = (result_row_list) => {
 
 // scripts/run-benchmark/generateHtmlVisualization/generateClientDebuggerScript.ts
 var escapeJsonForHtml = (json) => json.replace(/</g, "\\u003c");
-var generateClientDebuggerScript = (detail_json) => {
+var generateClientDebuggerScript = (detail_json, bundle_filename, solverName) => {
   const detail_json_text = escapeJsonForHtml(JSON.stringify(detail_json));
   const svgsonShim = encodeURIComponent(
     [
@@ -277,6 +389,12 @@ var generateClientDebuggerScript = (detail_json) => {
       "export * from 'https://esm.sh/svgson@5.2.1?target=es2022';"
     ].join("")
   );
+  const solverImport = bundle_filename ? `import SolverConstructor, { solverName as bundledSolverName } from "./${bundle_filename}";
+    const solverConstructors = SolverConstructor ? { [bundledSolverName || "${solverName || "Autorouter"}"]: SolverConstructor } : {};` : `import { AutoroutingPipeline1_OriginalUnravel, AutoroutingPipelineSolver as AutoroutingPipelineSolver2_PortPointPathing } from "https://esm.sh/@tscircuit/capacity-autorouter@latest";
+    const solverConstructors = {
+      AutoroutingPipelineSolver2_PortPointPathing,
+      AutoroutingPipeline1_OriginalUnravel
+    };`;
   return `<script>
     window.__benchmark_details = ${detail_json_text};
 </script>
@@ -297,15 +415,8 @@ var generateClientDebuggerScript = (detail_json) => {
     import React, { useMemo } from "react";
     import { createRoot } from "react-dom/client";
     import { GenericSolverDebugger } from "https://esm.sh/@tscircuit/solver-utils@latest/react?external=react,react-dom,svgson";
-    import {
-      AutoroutingPipeline1_OriginalUnravel,
-      AutoroutingPipelineSolver as AutoroutingPipelineSolver2_PortPointPathing
-    } from "https://esm.sh/@tscircuit/capacity-autorouter@latest";
 
-    const solverConstructors = {
-      AutoroutingPipelineSolver2_PortPointPathing,
-      AutoroutingPipeline1_OriginalUnravel
-    };
+    ${solverImport}
 
     const modal = document.getElementById("solver-debugger-modal");
     const modalTitle = document.getElementById("solver-debugger-title");
@@ -717,7 +828,13 @@ var generateWebComponents = () => {
 
 // scripts/run-benchmark/generateHtmlVisualization/index.ts
 var generateHtmlVisualization = (inputs) => {
-  const { summary_json, detail_json, result_row_list } = inputs;
+  const {
+    summary_json,
+    detail_json,
+    result_row_list,
+    bundle_filename,
+    solver_name
+  } = inputs;
   return `<!DOCTYPE html>
 <html lang="en">
 <head>
@@ -737,14 +854,14 @@ var generateHtmlVisualization = (inputs) => {
     ${generateWebComponents()}
     ${generateSolverDebuggerModal()}
     ${generateChartScripts(result_row_list)}
-    ${generateClientDebuggerScript(detail_json)}
+    ${generateClientDebuggerScript(detail_json, bundle_filename, solver_name)}
 </body>
 </html>`;
 };
 
 // scripts/run-benchmark/loadScenarioList.ts
 import { readdir, readFile } from "fs/promises";
-import path2 from "path";
+import path4 from "path";
 var loadScenarioList = async (inputs) => {
   const { datasetDirectory, scenarioCountLimit } = inputs;
   const datasetFileList = (await readdir(datasetDirectory)).filter((fileName) => fileName.endsWith(".simple-route.json")).sort();
@@ -755,7 +872,7 @@ var loadScenarioList = async (inputs) => {
   const scenarioList = [];
   for (const fileName of limitedFileList) {
     const scenarioName = fileName.replace(".simple-route.json", "");
-    const simpleRouteJsonPath = path2.join(datasetDirectory, fileName);
+    const simpleRouteJsonPath = path4.join(datasetDirectory, fileName);
     const simpleRouteJsonText = await readFile(simpleRouteJsonPath, "utf8");
     const simpleRouteJson = JSON.parse(simpleRouteJsonText);
     scenarioList.push({ scenarioName, simpleRouteJsonPath, simpleRouteJson });
@@ -1145,8 +1262,8 @@ var runBenchmark = async (inputs) => {
 // lib/cli/run/register.ts
 var findDatasetDirectory = async () => {
   const possiblePaths = [
-    path3.resolve(process.cwd(), "lib/dataset"),
-    path3.resolve(
+    path5.resolve(process.cwd(), "lib/dataset"),
+    path5.resolve(
       fileURLToPath(import.meta.url),
       "..",
       "..",
@@ -1155,7 +1272,7 @@ var findDatasetDirectory = async () => {
       "lib",
       "dataset"
     ),
-    path3.resolve(
+    path5.resolve(
       fileURLToPath(import.meta.url),
       "..",
       "..",
@@ -1179,15 +1296,24 @@ var registerRun = (program2) => {
   program2.command("run", { isDefault: true }).description("Run benchmark on an autorouter").argument("<autorouter-path>", "Path to autorouter TypeScript file").argument("[solver-name]", "Specific export name to use as solver").option("-l, --scenario-limit <count>", "Limit number of scenarios to run").option("-o, --output <path>", "Output HTML file path").action(
     async (autorouterPath, solverName, options) => {
       try {
-        const absolutePath = path3.resolve(autorouterPath);
+        const absolutePath = path5.resolve(autorouterPath);
         console.log(
           `${kleur.cyan("Loading autorouter from:")} ${absolutePath}`
         );
-        const { solverConstructor, solverName: detectedSolverName } = await loadUserAutorouter(absolutePath, solverName);
+        const {
+          solverConstructor,
+          solverName: detectedSolverName,
+          packageInfo
+        } = await loadUserAutorouter(absolutePath, solverName);
         const finalSolverName = solverName || detectedSolverName;
         console.log(
           `${kleur.green("\u2713")} Using autorouter: ${kleur.bold(finalSolverName)}`
         );
+        if (packageInfo) {
+          console.log(
+            `${kleur.green("\u2713")} From package: ${kleur.cyan(packageInfo.name)}@${packageInfo.version}`
+          );
+        }
         solverDisplayNameByConstructor.set(solverConstructor, finalSolverName);
         const datasetDirectory = await findDatasetDirectory();
         const scenarioCountLimit = options.scenarioLimit ? Number.parseInt(options.scenarioLimit, 10) : null;
@@ -1223,18 +1349,47 @@ ${kleur.cyan("Running benchmark with")} ${kleur.bold(String(scenarioList.length)
           scenarioResultList,
           scenarioList
         });
+        console.log(
+          kleur.cyan("Bundling autorouter for HTML visualization...")
+        );
+        let autorouterBundle = "";
+        let bundleFilename = "";
+        try {
+          autorouterBundle = await bundleAutorouter(
+            absolutePath,
+            finalSolverName
+          );
+          bundleFilename = `${finalSolverName}.bundle.js`;
+          console.log(
+            `${kleur.green("\u2713")} Bundled autorouter (${(autorouterBundle.length / 1024).toFixed(1)} KB)`
+          );
+        } catch (bundleError) {
+          console.warn(
+            kleur.yellow(
+              `Warning: Could not bundle autorouter: ${bundleError instanceof Error ? bundleError.message : String(bundleError)}`
+            )
+          );
+        }
         const htmlText = generateHtmlVisualization({
           summary_json: summaryJson,
           detail_json: detailJson,
-          result_row_list: resultRowList
+          result_row_list: resultRowList,
+          bundle_filename: bundleFilename,
+          solver_name: finalSolverName
         });
-        const outputDir = path3.resolve("results");
+        const outputDir = path5.resolve("results");
         await mkdir(outputDir, { recursive: true });
-        const outputPath = options.output ? path3.resolve(options.output) : path3.join(outputDir, `${finalSolverName}.html`);
+        const outputPath = options.output ? path5.resolve(options.output) : path5.join(outputDir, `${finalSolverName}.html`);
+        if (autorouterBundle && bundleFilename) {
+          const bundlePath = path5.join(outputDir, bundleFilename);
+          await writeFile(bundlePath, autorouterBundle);
+          console.log(
+            `${kleur.green("\u2713")} Bundle written to: ${kleur.cyan(bundlePath)}`
+          );
+        }
         await writeFile(outputPath, htmlText);
         console.log(
-          `
-${kleur.green("\u2713")} HTML results written to: ${kleur.cyan(outputPath)}`
+          `${kleur.green("\u2713")} HTML results written to: ${kleur.cyan(outputPath)}`
         );
         process.exit(0);
       } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/autorouting-dataset-01",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "type": "module",
   "main": "lib/dataset/index.ts",
   "bin": {
@@ -39,7 +39,6 @@
     "kleur": "^4.1.5"
   },
   "devDependencies": {
-    "tsup": "^8.2.4",
     "@biomejs/biome": "^2.3.13",
     "@tsci/imrishabh18.TB6612FNG": "^0.1.0",
     "@tsci/seveibar.PICO": "^0.1.0",
@@ -55,10 +54,12 @@
     "@tscircuit/core": "^0.0.1005",
     "@tscircuit/footprints": "^0.0.21",
     "@tscircuit/math-utils": "^0.0.33",
+    "@tscircuit/solver-utils": "^0.0.14",
+    "@types/bun": "^1.3.9",
     "@types/react": "^19.2.9",
     "circuit-json": "^0.0.371",
+    "graphics-debug": "^0.0.79",
     "tscircuit": "^0.0.1168",
-    "@tscircuit/solver-utils": "^0.0.14",
-    "graphics-debug": "^0.0.79"
+    "tsup": "^8.2.4"
   }
 }