@tscircuit/cli 0.1.1630 → 0.1.1632

package/dist/cli/snapshot/snapshot.worker.js

@@ -2674,7 +2674,7 @@ var renderCircuitJsonTo3dPng = async (circuitJson, options = {}) => {
 
 // lib/shared/process-snapshot-file.ts
 import {
-  convertCircuitJsonToPcbSvg,
+  convertCircuitJsonToPcbSvg as convertCircuitJsonToPcbSvg2,
   convertCircuitJsonToSchematicSvg
 } from "circuit-to-svg";
 
@@ -2801,8 +2801,23 @@ var import_make_vfs = __toESM(require_dist(), 1);
 // lib/shared/autorouter-diagnostics.ts
 import fs from "node:fs";
 import path from "node:path";
+import { convertCircuitJsonToPcbSvg } from "circuit-to-svg";
+
+// lib/shared/convert-svg-to-png.ts
+import { Resvg } from "@resvg/resvg-js";
+var convertSvgToPngBuffer = (svg) => {
+  const resvg = new Resvg(svg, {
+    fitTo: {
+      mode: "original"
+    }
+  });
+  return resvg.render().asPng();
+};
+
+// lib/shared/autorouter-diagnostics.ts
 var DEFAULT_DEBUG_DIR = path.join("dist", "autorouter-debug");
 var PROGRESS_LOG_INTERVAL_MS = 1e4;
+var CIRCUIT_JSON_ID_PATTERN = /\b(?:source|pcb|schematic|subcircuit|cad|simulation)_[a-z0-9_]*_\d+\b/gi;
 var parseAutorouterTimeout = (duration) => {
   const trimmed = duration.trim();
   const match = trimmed.match(/^(\d+(?:\.\d+)?)(ms|s|m)?$/);
@@ -2846,6 +2861,7 @@ class AutorouterDiagnostics {
   traceCountBySubcircuit = new Map;
   activePhase = null;
   completedPhaseTraces = [];
+  hasWrittenPlacementSnapshot = false;
   summary = [];
   rootCircuit;
   constructor(options = {}) {
@@ -2878,7 +2894,6 @@ class AutorouterDiagnostics {
     const phaseLabel = this.getPhaseLabel(this.activePhase);
     const message = `Autorouter timeout after ${this.formatElapsed(elapsedMs)} in ${phaseLabel}.`;
     this.log(kleur_default.red(message));
-    this.log(`Wrote debug artifact: ${path.relative(process.cwd(), artifactPath)}`);
     throw new AutorouterPhaseTimeoutError(message, artifactPath);
   }
   finalize(circuitJson) {
@@ -2905,7 +2920,7 @@ class AutorouterDiagnostics {
     const previousTraceCount = event.previousTraceCount ?? this.traceCountBySubcircuit.get(subcircuitId) ?? 0;
     this.activePhase = {
       subcircuitId,
-      componentDisplayName: event.componentDisplayName ?? subcircuitId,
+      componentDisplayName: event.componentDisplayName ?? "subcircuit",
       routingPhaseIndex,
       phaseOrdinal,
       phaseCount: event.phaseCount,
@@ -2920,6 +2935,11 @@ class AutorouterDiagnostics {
       hasLoggedStart: false,
       longRunningLoggingStarted: false
     };
+    if (this.options.enabled && !this.hasWrittenPlacementSnapshot) {
+      const placementCircuitJson = this.getCurrentCircuitJson().filter((element) => !this.isRouteElement(element));
+      this.writePngSnapshot("placement-unrouted.png", placementCircuitJson);
+      this.hasWrittenPlacementSnapshot = true;
+    }
     if (this.options.enabled) {
       this.logPhaseStart(this.activePhase);
     }
@@ -2982,6 +3002,9 @@ class AutorouterDiagnostics {
     if (this.shouldDumpSuccessfulOutput(activePhase.routingPhaseIndex)) {
       this.writeJson(this.getPhaseFileName(activePhase, "output.traces.json"), outputSrj?.traces ?? []);
     }
+    if (this.options.enabled) {
+      this.writePngSnapshot(`phase-${activePhase.routingPhaseIndex}-routed.png`, this.getCircuitJsonWithCompletedPhaseTraces());
+    }
     if (this.activePhase === activePhase) {
       this.activePhase = null;
     }
@@ -3010,7 +3033,7 @@ class AutorouterDiagnostics {
       if (!activePhase.hasLoggedStart) {
         this.logPhaseStart(activePhase, "failed");
       }
-      this.log(`  ${this.getPhaseLabel(activePhase)} error after ${this.formatElapsed(elapsedMs)}: ${error.message}`);
+      this.log(`  ${this.getPhaseLabel(activePhase)} error after ${this.formatElapsed(elapsedMs)}: ${this.formatUserFacingText(error.message)}`);
     }
     if (this.shouldDumpFailedInput(activePhase.routingPhaseIndex)) {
       this.writeJson(this.getPhaseFileName(activePhase, "input.simple-route.json"), event.simpleRouteJson ?? activePhase.simpleRouteJson ?? {});
@@ -3086,7 +3109,7 @@ class AutorouterDiagnostics {
   logPhaseStart(activePhase, reason) {
     const reasonText = reason ? ` ${reason}` : "";
     this.log([
-      `Autorouting ${activePhase.componentDisplayName} (${activePhase.subcircuitId}) ${this.getPhaseLabel(activePhase)}${reasonText} start:`,
+      `Autorouting ${this.formatUserFacingText(activePhase.componentDisplayName)} ${this.getPhaseLabel(activePhase)}${reasonText} start:`,
       `connections=${activePhase.connectionCount},`,
       `obstacles=${activePhase.obstacleCount},`,
       `previous_traces=${activePhase.previousTraceCount}`,
@@ -3141,8 +3164,54 @@ class AutorouterDiagnostics {
     fs.mkdirSync(debugDir, { recursive: true });
     const filePath = path.join(debugDir, fileName);
     fs.writeFileSync(filePath, JSON.stringify(value, null, 2));
+    this.logArtifact(filePath);
     return filePath;
   }
+  writePngSnapshot(fileName, circuitJson) {
+    const pcbSvg = convertCircuitJsonToPcbSvg(circuitJson);
+    const png = convertSvgToPngBuffer(pcbSvg);
+    const debugDir = path.resolve(this.options.debugDir ?? DEFAULT_DEBUG_DIR);
+    fs.mkdirSync(debugDir, { recursive: true });
+    const filePath = path.join(debugDir, fileName);
+    fs.writeFileSync(filePath, png);
+    this.logArtifact(filePath);
+  }
+  logArtifact(filePath) {
+    this.log(`Wrote debug artifact: ${path.relative(process.cwd(), filePath)}`);
+  }
+  getCircuitJsonWithCompletedPhaseTraces() {
+    const circuitJson = [...this.getCurrentCircuitJson()];
+    const elementIndexById = new Map;
+    for (const [index, element] of circuitJson.entries()) {
+      const id = this.getCircuitElementId(element);
+      if (id)
+        elementIndexById.set(id, index);
+    }
+    for (const trace of this.completedPhaseTraces) {
+      if (!trace || typeof trace !== "object")
+        continue;
+      const element = trace;
+      const id = this.getCircuitElementId(element);
+      const existingIndex = id ? elementIndexById.get(id) : undefined;
+      if (existingIndex === undefined) {
+        circuitJson.push(element);
+        if (id)
+          elementIndexById.set(id, circuitJson.length - 1);
+      } else {
+        circuitJson[existingIndex] = element;
+      }
+    }
+    return circuitJson;
+  }
+  getCircuitElementId(element) {
+    if (typeof element.type !== "string")
+      return;
+    const id = element[`${element.type}_id`];
+    return typeof id === "string" ? id : undefined;
+  }
+  isRouteElement(element) {
+    return element.type === "pcb_trace" || element.type === "pcb_via";
+  }
   getPhaseFileName(activePhase, suffix) {
     const phaseNumber = activePhase.routingPhaseIndex;
     return `phase-${phaseNumber}.${suffix}`;
@@ -3167,10 +3236,61 @@ class AutorouterDiagnostics {
     return parts.join(", ");
   }
   getConnectionNames(simpleRouteJson) {
-    return (simpleRouteJson?.connections ?? []).map((connection) => {
-      const name = connection.name ?? connection.rootConnectionName ?? connection.source_trace_id;
-      return typeof name === "string" ? name : null;
-    }).filter((name) => Boolean(name));
+    return [
+      ...new Set((simpleRouteJson?.connections ?? []).map((connection) => [
+        connection.rootConnectionName,
+        connection.name,
+        connection.source_trace_id
+      ].filter((value) => typeof value === "string").map((value) => this.resolveCircuitJsonId(value)).find((value) => value !== null)).filter((name) => name !== null))
+    ];
+  }
+  resolveCircuitJsonId(value) {
+    const circuitJson = this.getCurrentCircuitJson();
+    const element = circuitJson.find((candidate) => Object.entries(candidate).some(([key, candidateValue]) => key.endsWith("_id") && candidateValue === value));
+    if (!element)
+      return value;
+    if (element.type === "source_trace") {
+      if (typeof element.name === "string")
+        return element.name;
+      return this.getTraceSelector(element, circuitJson);
+    }
+    if (element.type === "source_net" && typeof element.name === "string") {
+      return `net.${element.name}`;
+    }
+    if (element.type === "source_port") {
+      return this.getPortSelector(element, circuitJson);
+    }
+    return null;
+  }
+  formatUserFacingText(value) {
+    let formattedValue = value;
+    for (const element of this.getCurrentCircuitJson()) {
+      for (const [key, id] of Object.entries(element)) {
+        if (!key.endsWith("_id") || typeof id !== "string")
+          continue;
+        formattedValue = formattedValue.replaceAll(id, this.resolveCircuitJsonId(id) ?? "internal element");
+      }
+    }
+    return formattedValue.replace(CIRCUIT_JSON_ID_PATTERN, "internal element");
+  }
+  getTraceSelector(trace, circuitJson) {
+    const portIds = trace.connected_source_port_ids;
+    if (!Array.isArray(portIds))
+      return null;
+    const selectors = portIds.map((portId) => typeof portId === "string" ? this.getPortSelectorById(portId, circuitJson) : null).filter((selector) => selector !== null);
+    return selectors.length >= 2 ? selectors.join(" to ") : null;
+  }
+  getPortSelectorById(sourcePortId, circuitJson) {
+    const port = circuitJson.find((element) => element.type === "source_port" && element.source_port_id === sourcePortId);
+    return port ? this.getPortSelector(port, circuitJson) : null;
+  }
+  getPortSelector(port, circuitJson) {
+    const portName = typeof port.most_frequently_referenced_by_name === "string" ? port.most_frequently_referenced_by_name : typeof port.name === "string" ? port.name : null;
+    if (!portName)
+      return null;
+    const component = circuitJson.find((element) => element.type === "source_component" && element.source_component_id === port.source_component_id);
+    const componentName = component && typeof component.name === "string" ? component.name : null;
+    return componentName ? `${componentName}.${portName}` : portName;
   }
   countErrors(simpleRouteJson) {
     const errors = simpleRouteJson?.errors;
@@ -3178,7 +3298,8 @@ class AutorouterDiagnostics {
   }
   getCurrentCircuitJson() {
     try {
-      return this.rootCircuit?.db?.toArray?.() ?? [];
+      const circuitJson = this.rootCircuit?.db?.toArray?.();
+      return Array.isArray(circuitJson) ? circuitJson : [];
     } catch {
       return [];
     }
@@ -3421,7 +3542,7 @@ async function generateCircuitJson({
   }
   runner.emit("renderComplete");
   const circuitJson = await runner.getCircuitJson();
-  autorouterDiagnostics.finalize(circuitJson);
+  await autorouterDiagnostics.finalize(circuitJson);
   if (saveToFile) {
     debug(`Saving circuit JSON to ${outputPath}`);
     fs4.writeFileSync(outputPath, JSON.stringify(circuitJson, null, 2));
@@ -3637,7 +3758,7 @@ var processSnapshotFile = async ({
   }
   if (!simulationOnly) {
     try {
-      pcbSvg = convertCircuitJsonToPcbSvg(circuitJson, {
+      pcbSvg = convertCircuitJsonToPcbSvg2(circuitJson, {
         ...pcbSnapshotSettings,
         layer: pcbLayer
       });

package/dist/lib/index.js

@@ -65811,7 +65811,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1628";
+var version = "0.1.1631";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -80118,6 +80118,28 @@ Publish completed with ${uploadResults.succeeded.length} files uploaded and ${up
 var debug2 = Debug2("tscircuit:devserver");
 var BINARY_FILE_EXTENSIONS2 = new Set([".glb", ".png", ".jpeg", ".jpg"]);
 var CONFIG_MODULE_FILENAMES2 = ["tscircuit.config.ts", "tscircuit.config.js"];
+var CIRCUIT_JSON_ID_PATTERN = /\b(?:source|pcb|schematic|subcircuit|cad|simulation)_[a-z0-9_]*_\d+\b/gi;
+var formatAutorouterDebugEvent = (event) => {
+  const parts = [
+    typeof event.componentDisplayName === "string" ? `component=${event.componentDisplayName}` : null,
+    typeof event.phase === "string" ? `phase=${event.phase}` : null,
+    typeof event.solverName === "string" ? `solver=${event.solverName}` : null,
+    typeof event.connectionCount === "number" ? `connections=${event.connectionCount}` : null,
+    typeof event.obstacleCount === "number" ? `obstacles=${event.obstacleCount}` : null,
+    typeof event.steps === "number" ? `steps=${event.steps}` : null,
+    typeof event.iteration === "number" ? `iteration=${event.iteration}` : null,
+    typeof event.progress === "number" ? `progress=${Math.round(event.progress * 100)}%` : null,
+    typeof event.iterationsPerSecond === "number" ? `iterations_per_second=${Math.round(event.iterationsPerSecond)}` : null,
+    typeof event.elapsedMs === "number" ? `elapsed=${Math.round(event.elapsedMs)}ms` : null
+  ].filter((part) => part !== null);
+  const error = event.error;
+  const errorMessage = error && typeof error === "object" && "message" in error ? error.message : typeof error === "string" ? error : null;
+  if (typeof errorMessage === "string") {
+    parts.push(`error=${errorMessage.replace(CIRCUIT_JSON_ID_PATTERN, "internal element")}`);
+  }
+  const eventType = typeof event.event_type === "string" ? event.event_type : "autorouting";
+  return `[autorouter] ${eventType}${parts.length > 0 ? ` ${parts.join(" ")}` : ""}`;
+};
 
 class DevServer {
   port;
@@ -80169,7 +80191,7 @@ class DevServer {
       this.eventsWatcher.on("*", (event) => {
         if (!String(event.event_type).startsWith("autorouting:"))
           return;
-        console.log(kleur_default.cyan(`[autorouter] ${event.event_type} ${JSON.stringify(event)}`));
+        console.log(kleur_default.cyan(formatAutorouterDebugEvent(event)));
       });
     }
     this.filesystemWatcher = watch(this.projectDir, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1630",
+  "version": "0.1.1632",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",