@tscircuit/core 0.0.387 → 0.0.388

package/dist/index.d.ts

@@ -12,7 +12,7 @@ import * as _tscircuit_layout from '@tscircuit/layout';
 import { ConnectivityMap } from 'circuit-json-to-connectivity-map';
 import { GraphicsObject } from 'graphics-debug';
 
-declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "InitializePortsFromChildren", "CreateNetsFromProps", "CreateTracesFromProps", "CreateTraceHintsFromProps", "SourceRender", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SchematicComponentRender", "SchematicPortRender", "SchematicLayout", "SchematicTraceRender", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbLayout", "PcbComponentSizeCalculation", "PcbBoardAutoSize", "PcbTraceRender", "PcbTraceHintRender", "PcbRouteNetIslands", "PcbDesignRuleChecks", "CadModelRender", "PartsEngineRender"];
+declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "InitializePortsFromChildren", "CreateNetsFromProps", "CreateTracesFromProps", "CreateTraceHintsFromProps", "SourceRender", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SchematicComponentRender", "SchematicPortRender", "SchematicLayout", "SchematicTraceRender", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbLayout", "PcbComponentSizeCalculation", "PcbBoardAutoSize", "PcbTraceHintRender", "PcbTraceRender", "PcbRouteNetIslands", "PcbDesignRuleChecks", "CadModelRender", "PartsEngineRender"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
 type RenderPhaseFn<K extends RenderPhase = RenderPhase> = `doInitial${K}` | `update${K}` | `remove${K}`;
 type RenderPhaseStates = Record<RenderPhase, {

package/dist/index.js

@@ -94,8 +94,8 @@ var orderedRenderPhases = [
   "PcbLayout",
   "PcbComponentSizeCalculation",
   "PcbBoardAutoSize",
-  "PcbTraceRender",
   "PcbTraceHintRender",
+  "PcbTraceRender",
   "PcbRouteNetIslands",
   "PcbDesignRuleChecks",
   "CadModelRender",
@@ -3769,7 +3769,7 @@ var createSchematicTraceJunctions = ({
   return [];
 };
 
-// lib/components/primitive-components/Trace/get-max-length-from-conn ected-capacitors.ts
+// lib/components/primitive-components/Trace/get-max-length-from-connected-capacitors.ts
 var getMaxLengthFromConnectedCapacitors = (ports, { db }) => {
   const capacitorMaxLengths = ports.map((port) => {
     const sourcePort = db.source_port.get(port.source_port_id);
@@ -6001,6 +6001,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
   if (!db) {
     throw new Error("db or circuitJson is required");
   }
+  const traceHints = db.pcb_trace_hint.list();
   const relevantSubcircuitIds = subcircuit_id ? /* @__PURE__ */ new Set([subcircuit_id]) : null;
   if (subcircuit_id) {
     const descendantSubcircuitIds = getDescendantSubcircuitIds(
@@ -6073,16 +6074,40 @@ var getSimpleRouteJsonFromCircuitJson = ({
       };
     });
     if (connectedPorts.length < 2) return null;
+    const [portA, portB] = connectedPorts;
+    const layerA = portA.layers?.[0] ?? "top";
+    const layerB = portB.layers?.[0] ?? "top";
+    const matchingHints = traceHints.filter(
+      (hint) => hint.pcb_port_id === portA.pcb_port_id || hint.pcb_port_id === portB.pcb_port_id
+    );
+    const hintPoints = [];
+    for (const hint of matchingHints) {
+      const port = db.pcb_port.get(hint.pcb_port_id);
+      const layer = port?.layers?.[0] ?? "top";
+      for (const pt of hint.route) {
+        hintPoints.push({
+          x: pt.x,
+          y: pt.y,
+          layer
+        });
+      }
+    }
     return {
       name: trace.source_trace_id ?? connMap.getNetConnectedToId(trace.source_trace_id) ?? "",
       source_trace_id: trace.source_trace_id,
-      pointsToConnect: connectedPorts.map((port) => {
-        return {
-          x: port.x,
-          y: port.y,
-          layer: port.layers?.[0] ?? "top"
-        };
-      })
+      pointsToConnect: [
+        {
+          x: portA.x,
+          y: portA.y,
+          layer: layerA
+        },
+        ...hintPoints,
+        {
+          x: portB.x,
+          y: portB.y,
+          layer: layerB
+        }
+      ]
     };
   }).filter((c) => c !== null);
   const source_nets = db.source_net.list().filter(
@@ -7891,7 +7916,7 @@ import { identity as identity4 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.386",
+  version: "0.0.387",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.387",
+  "version": "0.0.388",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",