@tscircuit/core 0.0.86 → 0.0.88

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import * as zod from 'zod';
 import { ZodType, z } from 'zod';
-import { AnySoupElement, PCBTraceError, PCBPlacementError, AnySourceComponent, RouteHintPoint } from '@tscircuit/soup';
-import { LayerRef } from 'circuit-json';
+import { LayerRef, AnyCircuitElement, PCBTraceError, PCBPlacementError, AnySourceComponent, RouteHintPoint } from 'circuit-json';
 import { SoupUtilObjects } from '@tscircuit/soup-util';
 import { ReactElement } from 'react';
 import { Matrix } from 'transformation-matrix';
@@ -27,8 +26,8 @@ declare class Circuit {
     };
     _guessRootComponent(): void;
     render(): void;
-    getSoup(): AnySoupElement[];
-    getCircuitJson(): AnySoupElement[];
+    getSoup(): AnyCircuitElement[];
+    getCircuitJson(): AnyCircuitElement[];
     getSvg(options: {
         view: "pcb";
         layer?: string;

package/dist/index.js

@@ -542,7 +542,7 @@ var PrimitiveComponent = class extends Renderable {
     if (typeof message === "string") {
       return super.renderError(message);
     }
-    this.root?.db.pcb_error.insert(message);
+    this.root?.db.pcb_placement_error.insert(message);
   }
   getString() {
     const { lowercaseComponentName: cname, _parsedProps: props, parent } = this;
@@ -1401,7 +1401,7 @@ var PlatedHole = class extends PrimitiveComponent {
       const pcb_plated_hole = db.pcb_plated_hole.insert({
         pcb_component_id,
         pcb_port_id: this.matchedPort?.pcb_port_id,
-        // @ts-ignore - some issue with @tscircuit/soup union type
+        // @ts-ignore - some issue with circuit-json union type
         outer_diameter: props.outerDiameter,
         hole_diameter: props.holeDiameter,
         shape: "circle",
@@ -1674,6 +1674,7 @@ var Net = class extends PrimitiveComponent {
             ]
           }
         ])
+        // Remove as any when autorouting-dataset has been updated
       );
       const trace = solution[0];
       if (!trace) {
@@ -2344,6 +2345,21 @@ var mergeRoutes = (routes) => {
       merged.push(...next_route.reverse());
     }
   }
+  for (let i = 1; i < merged.length - 1; i++) {
+    const lastPoint = merged[i - 1];
+    const currentPoint = merged[i];
+    if (lastPoint.route_type !== "wire") continue;
+    if (currentPoint.route_type !== "wire") continue;
+    if (lastPoint.layer !== currentPoint.layer) {
+      merged.splice(i, 0, {
+        x: lastPoint.x,
+        y: lastPoint.y,
+        from_layer: lastPoint.layer,
+        to_layer: currentPoint.layer,
+        route_type: "via"
+      });
+    }
+  }
   return merged;
 };
 
@@ -2615,11 +2631,13 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     );
     const [obstacles, errGettingObstacles] = tryNow(
       () => getObstaclesFromSoup(this.root.db.toArray())
+      // Remove as any when autorouting-dataset gets updated
     );
     if (errGettingObstacles) {
       this.renderError({
-        type: "pcb_error",
+        type: "pcb_trace_error",
         error_type: "pcb_trace_error",
+        pcb_trace_error_id: this.pcb_trace_id,
         message: `Error getting obstacles for autorouting: ${errGettingObstacles.message}`,
         source_trace_id: this.source_trace_id,
         center: { x: 0, y: 0 },
@@ -2696,10 +2714,11 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
         traces = ijump.solveAndMapToTraces();
       } catch (e) {
         this.renderError({
-          type: "pcb_error",
+          type: "pcb_trace_error",
+          pcb_trace_error_id: this.source_trace_id,
           error_type: "pcb_trace_error",
           message: `error solving route: ${e.message}`,
-          source_trace_id: this.source_trace_id,
+          source_trace_id: this.pcb_trace_id,
           center: { x: (a.x + b.x) / 2, y: (a.y + b.y) / 2 },
           pcb_port_ids: ports.map((p) => p.pcb_port_id),
           pcb_trace_id: this.pcb_trace_id,
@@ -2709,8 +2728,9 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       if (!traces) return;
       if (traces.length === 0) {
         this.renderError({
-          type: "pcb_error",
+          type: "pcb_trace_error",
           error_type: "pcb_trace_error",
+          pcb_trace_error_id: this.pcb_trace_id,
           message: `Could not find a route for ${this}`,
           source_trace_id: this.source_trace_id,
           center: { x: (a.x + b.x) / 2, y: (a.y + b.y) / 2 },
@@ -2732,15 +2752,23 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       if (pcbPortA && trace.route[0].route_type === "wire") {
         trace.route[0].start_pcb_port_id = pcbPortA;
       }
-      if (pcbPortB && trace.route[0].route_type === "wire") {
-        trace.route[0].end_pcb_port_id = pcbPortB;
+      const lastRoutePoint = trace.route[trace.route.length - 1];
+      if (pcbPortB && lastRoutePoint.route_type === "wire") {
+        lastRoutePoint.end_pcb_port_id = pcbPortB;
       }
       routes.push(trace.route);
     }
     const mergedRoute = mergeRoutes(routes);
+    const pcb_trace = db.pcb_trace.insert({
+      route: mergedRoute,
+      source_trace_id: this.source_trace_id
+    });
+    this._portsRoutedOnPcb = ports;
+    this.pcb_trace_id = pcb_trace.pcb_trace_id;
     for (const point of mergedRoute) {
       if (point.route_type === "via") {
         db.pcb_via.insert({
+          pcb_trace_id: pcb_trace.pcb_trace_id,
           x: point.x,
           y: point.y,
           hole_diameter: 0.3,
@@ -2751,12 +2779,6 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
         });
       }
     }
-    const pcb_trace = db.pcb_trace.insert({
-      route: mergedRoute,
-      source_trace_id: this.source_trace_id
-    });
-    this._portsRoutedOnPcb = ports;
-    this.pcb_trace_id = pcb_trace.pcb_trace_id;
   }
   doInitialSchematicTraceRender() {
     const { db } = this.root;
@@ -2970,7 +2992,7 @@ var Capacitor = class extends NormalComponent {
 import { chipProps } from "@tscircuit/props";
 
 // lib/utils/schematic/getAllDimensionsForSchematicBox.ts
-import "@tscircuit/soup";
+import "circuit-json";
 
 // lib/utils/schematic/getSizeOfSidesFromPortArrangement.ts
 var hasExplicitPinMapping = (pa) => {
@@ -3238,7 +3260,7 @@ var underscorifyPortArrangement = (portArrangement) => {
 };
 
 // lib/soup/underscorifyPinStyles.ts
-import "@tscircuit/soup";
+import "circuit-json";
 import "zod";
 var underscorifyPinStyles = (pinStyles) => {
   if (!pinStyles) return void 0;
@@ -3703,7 +3725,7 @@ var Circuit = class {
 "${e.message}"`
       );
     });
-    return circuitToSvg.circuitJsonToPcbSvg(this.getCircuitJson());
+    return circuitToSvg.convertCircuitJsonToPcbSvg(this.getCircuitJson());
   }
   async preview(previewNameOrOpts) {
     const previewOpts = typeof previewNameOrOpts === "object" ? previewNameOrOpts : { previewName: previewNameOrOpts };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.86",
+  "version": "0.0.88",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -21,7 +21,7 @@
     "@types/react": "^18.3.3",
     "@types/react-reconciler": "^0.28.8",
     "bun-match-svg": "0.0.2",
-    "circuit-to-svg": "^0.0.36",
+    "circuit-to-svg": "^0.0.37",
     "debug": "^4.3.6",
     "howfat": "^0.3.8",
     "looks-same": "^9.0.1",
@@ -35,10 +35,9 @@
     "@tscircuit/infgrid-ijump-astar": "^0.0.21",
     "@tscircuit/math-utils": "^0.0.4",
     "@tscircuit/props": "^0.0.65",
-    "@tscircuit/soup": "^0.0.73",
-    "@tscircuit/soup-util": "^0.0.28",
-    "circuit-json": "^0.0.77",
-    "circuit-json-to-connectivity-map": "^0.0.15",
+    "circuit-json": "^0.0.78",
+    "@tscircuit/soup-util": "^0.0.31",
+    "circuit-json-to-connectivity-map": "^0.0.17",
     "footprinter": "^0.0.44",
     "nanoid": "^5.0.7",
     "performance-now": "^2.1.0",