@tscircuit/core 0.0.154 → 0.0.156

package/dist/index.d.ts

@@ -9,7 +9,7 @@ import { Matrix } from 'transformation-matrix';
 import { SoupUtilObjects } from '@tscircuit/soup-util';
 import * as _tscircuit_layout from '@tscircuit/layout';
 
-declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "InitializePortsFromChildren", "CreateNetsFromProps", "CreateTracesFromProps", "CreateTraceHintsFromProps", "SourceRender", "SourceParentAttachment", "PortDiscovery", "PortMatching", "SourceTraceRender", "SchematicComponentRender", "SchematicPortRender", "SchematicLayout", "SchematicTraceRender", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbLayout", "PcbTraceRender", "PcbTraceHintRender", "PcbRouteNetIslands", "PcbComponentSizeCalculation", "CadModelRender"];
+declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "InitializePortsFromChildren", "CreateNetsFromProps", "CreateTracesFromProps", "CreateTraceHintsFromProps", "SourceRender", "SourceParentAttachment", "PortDiscovery", "PortMatching", "SourceTraceRender", "SourceAddConnectivityMapKey", "SchematicComponentRender", "SchematicPortRender", "SchematicLayout", "SchematicTraceRender", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbLayout", "PcbTraceRender", "PcbTraceHintRender", "PcbRouteNetIslands", "PcbComponentSizeCalculation", "CadModelRender"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
 type RenderPhaseFn<K extends RenderPhase = RenderPhase> = `doInitial${K}` | `update${K}` | `remove${K}`;
 type RenderPhaseStates = Record<RenderPhase, {
@@ -351,11 +351,17 @@ declare class Net extends PrimitiveComponent<typeof netProps> {
     renderError(message: Parameters<typeof PrimitiveComponent.prototype.renderError>[0]): void;
 }
 
-declare class Trace extends PrimitiveComponent<typeof traceProps> {
+interface TraceI extends PrimitiveComponent<typeof traceProps> {
+    source_trace_id: string | null;
+    subcircuit_connectivity_map_key: string | null;
+}
+
+declare class Trace extends PrimitiveComponent<typeof traceProps> implements TraceI {
     source_trace_id: string | null;
     pcb_trace_id: string | null;
     schematic_trace_id: string | null;
     _portsRoutedOnPcb: Port[];
+    subcircuit_connectivity_map_key: string | null;
     constructor(props: z.input<typeof traceProps>);
     get config(): {
         zodProps: z.ZodUnion<[z.ZodObject<z.objectUtil.extendShape<{
@@ -841,6 +847,7 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     };
     doInitialCreateTraceHintsFromProps(): void;
     _getSimpleRouteJsonFromPcbTraces(): SimpleRouteJson;
+    doInitialSourceAddConnectivityMapKey(): void;
     doInitialPcbTraceRender(): void;
     updatePcbTraceRender(): void;
     doInitialSchematicLayout(): void;

package/dist/index.js

@@ -62,6 +62,7 @@ var orderedRenderPhases = [
   "PortDiscovery",
   "PortMatching",
   "SourceTraceRender",
+  "SourceAddConnectivityMapKey",
   "SchematicComponentRender",
   "SchematicPortRender",
   "SchematicLayout",
@@ -1654,7 +1655,7 @@ var Port = class extends PrimitiveComponent {
     const matchedPcbElm = this.matchedComponents.find((c) => c.isPcbPrimitive);
     if (!matchedPcbElm) {
       throw new Error(
-        `Port ${this} has no matched pcb component, can't get global schematic position`
+        `Port ${this} has no matched pcb component, can't get global pcb position`
       );
     }
     return matchedPcbElm?._getGlobalPcbPositionBeforeLayout() ?? { x: 0, y: 0 };
@@ -2929,6 +2930,7 @@ var TraceHint = class extends PrimitiveComponent {
 // lib/components/primitive-components/Group/Group.ts
 import * as SAL from "@tscircuit/schematic-autolayout";
 import { getObstaclesFromSoup } from "@tscircuit/infgrid-ijump-astar";
+import { ConnectivityMap } from "circuit-json-to-connectivity-map";
 var Group = class extends NormalComponent {
   _asyncAutoroutingResult = null;
   get config() {
@@ -3001,6 +3003,35 @@ var Group = class extends NormalComponent {
       minTraceWidth: this._parsedProps.minTraceWidth ?? 0.1
     };
   }
+  doInitialSourceAddConnectivityMapKey() {
+    if (!this.isSubcircuit) return;
+    const { db } = this.root;
+    const traces = this.selectAll("trace");
+    const connMap = new ConnectivityMap({});
+    connMap.addConnections(
+      traces.map((t) => {
+        const source_trace = db.source_trace.get(
+          t.source_trace_id
+        );
+        if (!source_trace) return null;
+        return [
+          source_trace.source_trace_id,
+          ...source_trace.connected_source_port_ids,
+          ...source_trace.connected_source_net_ids
+        ];
+      }).filter((c) => c !== null)
+    );
+    for (const trace of traces) {
+      if (!trace.source_trace_id) continue;
+      const connNetId = connMap.getNetConnectedToId(trace.source_trace_id);
+      if (!connNetId) continue;
+      const { name: subcircuitName } = this._parsedProps;
+      trace.subcircuit_connectivity_map_key = `${subcircuitName ?? `unnamedsubcircuit${this._renderId}`}_${connNetId}`;
+      db.source_trace.update(trace.source_trace_id, {
+        subcircuit_connectivity_map_key: trace.subcircuit_connectivity_map_key
+      });
+    }
+  }
   doInitialPcbTraceRender() {
     if (this._shouldUseTraceByTraceRouting()) return;
     if (this.props.autorouter?.serverUrl) {
@@ -3135,7 +3166,7 @@ var stringProxy = new Proxy(
 );
 var FTYPE = stringProxy;
 
-// lib/components/primitive-components/Trace.ts
+// lib/components/primitive-components/Trace/Trace.ts
 import {
   MultilayerIjump,
   getObstaclesFromSoup as getObstaclesFromSoup2
@@ -3331,7 +3362,7 @@ function tryNow(fn) {
   }
 }
 
-// lib/components/primitive-components/Trace.ts
+// lib/components/primitive-components/Trace/Trace.ts
 import "zod";
 
 // lib/utils/autorouting/getDominantDirection.ts
@@ -3382,8 +3413,95 @@ var getStubEdges = ({
   return edges;
 };
 
-// lib/components/primitive-components/Trace.ts
+// lib/components/primitive-components/Trace/Trace.ts
+import "@tscircuit/math-utils";
+
+// lib/components/primitive-components/Trace/push-edges-of-schematic-trace-to-prevent-overlap.ts
 import { doesLineIntersectLine } from "@tscircuit/math-utils";
+var pushEdgesOfSchematicTraceToPreventOverlap = ({
+  edges,
+  db
+}) => {
+  const otherEdges = [];
+  for (const otherSchematicTrace of db.schematic_trace.list()) {
+    otherEdges.push(...otherSchematicTrace.edges);
+  }
+  const edgeOrientation = (edge) => {
+    const { from, to } = edge;
+    return from.x === to.x ? "vertical" : "horizontal";
+  };
+  for (const mySegment of edges) {
+    const mySegmentOrientation = edgeOrientation(mySegment);
+    const findOverlappingParallelSegment = () => otherEdges.find(
+      (otherEdge) => edgeOrientation(otherEdge) === mySegmentOrientation && doesLineIntersectLine(
+        [mySegment.from, mySegment.to],
+        [otherEdge.from, otherEdge.to],
+        {
+          lineThickness: 0.01
+        }
+      )
+    );
+    let overlappingParallelSegmentFromOtherTrace = findOverlappingParallelSegment();
+    while (overlappingParallelSegmentFromOtherTrace) {
+      if (mySegmentOrientation === "horizontal") {
+        mySegment.from.y += 0.1;
+        mySegment.to.y += 0.1;
+      } else {
+        mySegment.from.x += 0.1;
+        mySegment.to.x += 0.1;
+      }
+      overlappingParallelSegmentFromOtherTrace = findOverlappingParallelSegment();
+    }
+  }
+};
+
+// lib/components/primitive-components/Trace/create-schematic-trace-crossing-segments.ts
+import { doesLineIntersectLine as doesLineIntersectLine2 } from "@tscircuit/math-utils";
+var createSchematicTraceCrossingSegments = ({
+  edges,
+  db
+}) => {
+  const otherEdges = [];
+  for (const otherSchematicTrace of db.schematic_trace.list()) {
+    otherEdges.push(...otherSchematicTrace.edges);
+  }
+  for (let i = 0; i < edges.length; i++) {
+    const edge = edges[i];
+    const edgeOrientation = edge.from.x === edge.to.x ? "vertical" : "horizontal";
+    for (const otherEdge of otherEdges) {
+      const otherOrientation = otherEdge.from.x === otherEdge.to.x ? "vertical" : "horizontal";
+      if (edgeOrientation === otherOrientation) continue;
+      const intersection = doesLineIntersectLine2(
+        [edge.from, edge.to],
+        [otherEdge.from, otherEdge.to],
+        { lineThickness: 0.01 }
+      );
+      if (intersection) {
+        const intersectX = edgeOrientation === "vertical" ? edge.from.x : otherEdge.from.x;
+        const intersectY = edgeOrientation === "vertical" ? otherEdge.from.y : edge.from.y;
+        const crossingSegmentLength = 0.1;
+        const crossingPoint = { x: intersectX, y: intersectY };
+        const beforeCrossing = {
+          x: edgeOrientation === "vertical" ? crossingPoint.x : crossingPoint.x - crossingSegmentLength / 2,
+          y: edgeOrientation === "vertical" ? crossingPoint.y - crossingSegmentLength / 2 : crossingPoint.y
+        };
+        const afterCrossing = {
+          x: edgeOrientation === "vertical" ? crossingPoint.x : crossingPoint.x + crossingSegmentLength / 2,
+          y: edgeOrientation === "vertical" ? crossingPoint.y + crossingSegmentLength / 2 : crossingPoint.y
+        };
+        const newEdges = [
+          { from: edge.from, to: beforeCrossing },
+          { from: beforeCrossing, to: afterCrossing, is_crossing: true },
+          { from: afterCrossing, to: edge.to }
+        ];
+        edges.splice(i, 1, ...newEdges);
+        i += 2;
+      }
+    }
+  }
+};
+
+// lib/components/primitive-components/Trace/Trace.ts
 var portToObjective = (port) => {
   const portPosition = port._getGlobalPcbPositionAfterLayout();
   return {
@@ -3397,6 +3515,7 @@ var Trace = class extends PrimitiveComponent {
   pcb_trace_id = null;
   schematic_trace_id = null;
   _portsRoutedOnPcb;
+  subcircuit_connectivity_map_key = null;
   constructor(props) {
     super(props);
     this._portsRoutedOnPcb = [];
@@ -3860,37 +3979,8 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
         to: route[i + 1]
       });
     }
-    const otherEdges = [];
-    for (const otherSchematicTrace of db.schematic_trace.list()) {
-      otherEdges.push(...otherSchematicTrace.edges);
-    }
-    const edgeOrientation = (edge) => {
-      const { from, to } = edge;
-      return from.x === to.x ? "vertical" : "horizontal";
-    };
-    for (const mySegment of edges) {
-      const mySegmentOrientation = edgeOrientation(mySegment);
-      const findOverlappingParallelSegment = () => otherEdges.find(
-        (otherEdge) => edgeOrientation(otherEdge) === mySegmentOrientation && doesLineIntersectLine(
-          [mySegment.from, mySegment.to],
-          [otherEdge.from, otherEdge.to],
-          {
-            lineThickness: 0.01
-          }
-        )
-      );
-      let overlappingParallelSegmentFromOtherTrace = findOverlappingParallelSegment();
-      while (overlappingParallelSegmentFromOtherTrace) {
-        if (mySegmentOrientation === "horizontal") {
-          mySegment.from.y += 0.1;
-          mySegment.to.y += 0.1;
-        } else {
-          mySegment.from.x += 0.1;
-          mySegment.to.x += 0.1;
-        }
-        overlappingParallelSegmentFromOtherTrace = findOverlappingParallelSegment();
-      }
-    }
+    pushEdgesOfSchematicTraceToPreventOverlap({ edges, db });
+    createSchematicTraceCrossingSegments({ edges, db });
     const lastEdge = edges[edges.length - 1];
     const lastEdgePort = portsWithPosition[portsWithPosition.length - 1];
     const lastDominantDirection = getDominantDirection(lastEdge);
@@ -3899,7 +3989,8 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     );
     const trace = db.schematic_trace.insert({
       source_trace_id: this.source_trace_id,
-      edges
+      edges,
+      junctions: []
     });
     this.schematic_trace_id = trace.schematic_trace_id;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.154",
+  "version": "0.0.156",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -43,9 +43,9 @@
     "@tscircuit/props": "^0.0.86",
     "@tscircuit/schematic-autolayout": "^0.0.5",
     "@tscircuit/soup-util": "^0.0.33",
-    "circuit-json": "^0.0.96",
+    "circuit-json": "^0.0.98",
     "circuit-json-to-connectivity-map": "^0.0.17",
-    "circuit-to-svg": "^0.0.62",
+    "circuit-to-svg": "^0.0.64",
     "format-si-unit": "^0.0.2",
     "nanoid": "^5.0.7",
     "performance-now": "^2.1.0",