@tscircuit/core 0.0.157 → 0.0.159

package/dist/index.d.ts

@@ -4650,7 +4650,6 @@ declare class NetAlias extends PrimitiveComponent<typeof netAliasProps> {
             net?: string | undefined;
         }>;
     };
-    initPorts(): void;
     doInitialSchematicComponentRender(): void;
 }
 

package/dist/index.js

@@ -3427,14 +3427,48 @@ 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
+
+// lib/components/primitive-components/Trace/get-other-schematic-traces.ts
+var getOtherSchematicTraces = ({
+  db,
+  source_trace_id,
+  sameNetOnly,
+  differentNetOnly
 }) => {
-  const otherEdges = [];
+  if (!sameNetOnly && !differentNetOnly) {
+    differentNetOnly = true;
+  }
+  const mySourceTrace = db.source_trace.get(source_trace_id);
+  const traces = [];
   for (const otherSchematicTrace of db.schematic_trace.list()) {
-    otherEdges.push(...otherSchematicTrace.edges);
+    if (otherSchematicTrace.source_trace_id === source_trace_id) continue;
+    const otherSourceTrace = db.source_trace.get(
+      otherSchematicTrace.source_trace_id
+    );
+    const isSameNet = otherSourceTrace?.subcircuit_connectivity_map_key === mySourceTrace.subcircuit_connectivity_map_key;
+    if (differentNetOnly && isSameNet) {
+      continue;
+    }
+    if (sameNetOnly && !isSameNet) {
+      continue;
+    }
+    traces.push(otherSchematicTrace);
   }
+  return traces;
+};
+
+// lib/components/primitive-components/Trace/push-edges-of-schematic-trace-to-prevent-overlap.ts
+var pushEdgesOfSchematicTraceToPreventOverlap = ({
+  edges,
+  db,
+  source_trace_id
+}) => {
+  const mySourceTrace = db.source_trace.get(source_trace_id);
+  const otherEdges = getOtherSchematicTraces({
+    db,
+    source_trace_id,
+    differentNetOnly: true
+  }).flatMap((t) => t.edges);
   const edgeOrientation = (edge) => {
     const { from, to } = edge;
     return from.x === to.x ? "vertical" : "horizontal";
@@ -3468,12 +3502,14 @@ var pushEdgesOfSchematicTraceToPreventOverlap = ({
 import { doesLineIntersectLine as doesLineIntersectLine2 } from "@tscircuit/math-utils";
 var createSchematicTraceCrossingSegments = ({
   edges,
-  db
+  db,
+  source_trace_id
 }) => {
-  const otherEdges = [];
-  for (const otherSchematicTrace of db.schematic_trace.list()) {
-    otherEdges.push(...otherSchematicTrace.edges);
-  }
+  const otherEdges = getOtherSchematicTraces({
+    db,
+    source_trace_id,
+    differentNetOnly: true
+  }).flatMap((t) => t.edges);
   for (let i = 0; i < edges.length; i++) {
     const edge = edges[i];
     const edgeOrientation = edge.from.x === edge.to.x ? "vertical" : "horizontal";
@@ -3510,6 +3546,63 @@ var createSchematicTraceCrossingSegments = ({
   }
 };
 
+// lib/components/primitive-components/Trace/create-schematic-trace-junctions.ts
+var isOrthogonal = (edge1, edge2) => {
+  const isVertical1 = edge1.from.x === edge1.to.x;
+  const isVertical2 = edge2.from.x === edge2.to.x;
+  return isVertical1 !== isVertical2;
+};
+var getIntersectionPoint = (edge1, edge2) => {
+  if (!isOrthogonal(edge1, edge2)) return null;
+  const isVertical1 = edge1.from.x === edge1.to.x;
+  const vertical = isVertical1 ? edge1 : edge2;
+  const horizontal = isVertical1 ? edge2 : edge1;
+  const minX = Math.min(horizontal.from.x, horizontal.to.x);
+  const maxX = Math.max(horizontal.from.x, horizontal.to.x);
+  if (vertical.from.x < minX || vertical.from.x > maxX) return null;
+  const minY = Math.min(vertical.from.y, vertical.to.y);
+  const maxY = Math.max(vertical.from.y, vertical.to.y);
+  if (horizontal.from.y < minY || horizontal.from.y > maxY) return null;
+  return {
+    x: vertical.from.x,
+    y: horizontal.from.y
+  };
+};
+var createSchematicTraceJunctions = ({
+  edges: myEdges,
+  db,
+  source_trace_id
+}) => {
+  const otherEdges = getOtherSchematicTraces({
+    db,
+    source_trace_id,
+    sameNetOnly: true
+  }).flatMap((t) => t.edges);
+  const junctions = /* @__PURE__ */ new Set();
+  for (const myEdge of myEdges) {
+    for (const otherEdge of otherEdges) {
+      const intersection = getIntersectionPoint(myEdge, otherEdge);
+      if (intersection) {
+        junctions.add(`${intersection.x},${intersection.y}`);
+      }
+    }
+  }
+  return Array.from(junctions).map((key) => {
+    const [x, y] = key.split(",").map(Number);
+    return { x, y };
+  });
+};
+
+// lib/utils/schematic/getEnteringEdgeFromDirection.ts
+var getEnteringEdgeFromDirection = (direction) => {
+  return {
+    up: "bottom",
+    down: "top",
+    left: "right",
+    right: "left"
+  }[direction] ?? null;
+};
+
 // lib/components/primitive-components/Trace/Trace.ts
 var portToObjective = (port) => {
   const portPosition = port._getGlobalPcbPositionAfterLayout();
@@ -3920,6 +4013,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     const { _parsedProps: props, parent } = this;
     if (!parent) throw new Error("Trace has no parent");
     const { allPortsFound, portsWithSelectors: connectedPorts } = this._findConnectedPorts();
+    const { netsWithSelectors } = this._findConnectedNets();
     if (!allPortsFound) return;
     const obstacles = [];
     const connection = {
@@ -3954,6 +4048,20 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       schematic_port_id: port.schematic_port_id ?? void 0,
       facingDirection: port.facingDirection
     }));
+    const isPortAndNetConnection = portsWithPosition.length === 1 && netsWithSelectors.length === 1;
+    if (isPortAndNetConnection) {
+      const net = netsWithSelectors[0].net;
+      const { port, position: anchorPos } = portsWithPosition[0];
+      const netLabel = db.schematic_net_label.insert({
+        text: net._parsedProps.name,
+        source_net_id: net.source_net_id,
+        anchor_position: anchorPos,
+        // TODO compute the center based on the text size
+        center: anchorPos,
+        anchor_side: getEnteringEdgeFromDirection(port.facingDirection) ?? "bottom"
+      });
+      return;
+    }
     if (portsWithPosition.length < 2) {
       return;
     }
@@ -3988,8 +4096,14 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
         to: route[i + 1]
       });
     }
-    pushEdgesOfSchematicTraceToPreventOverlap({ edges, db });
-    createSchematicTraceCrossingSegments({ edges, db });
+    const source_trace_id = this.source_trace_id;
+    pushEdgesOfSchematicTraceToPreventOverlap({ edges, db, source_trace_id });
+    createSchematicTraceCrossingSegments({ edges, db, source_trace_id });
+    const junctions = createSchematicTraceJunctions({
+      edges,
+      db,
+      source_trace_id: this.source_trace_id
+    });
     const lastEdge = edges[edges.length - 1];
     const lastEdgePort = portsWithPosition[portsWithPosition.length - 1];
     const lastDominantDirection = getDominantDirection(lastEdge);
@@ -3999,7 +4113,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     const trace = db.schematic_trace.insert({
       source_trace_id: this.source_trace_id,
       edges,
-      junctions: []
+      junctions
     });
     this.schematic_trace_id = trace.schematic_trace_id;
   }
@@ -4456,22 +4570,16 @@ var NetAlias = class extends PrimitiveComponent {
       zodProps: netAliasProps
     };
   }
-  initPorts() {
-    this.add(
-      new Port({
-        name: "pin1",
-        pinNumber: 1,
-        aliases: ["anode", "pos", "left"]
-      })
-    );
-  }
   doInitialSchematicComponentRender() {
     const { db } = this.root;
     const { _parsedProps: props } = this;
+    const anchorPos = { x: props.schX ?? 0, y: props.schY ?? 0 };
     const netAlias = db.schematic_net_label.insert({
       text: props.net,
       source_net_id: props.net,
-      center: { x: props.schX ?? 0, y: props.schY ?? 0 },
+      anchor_position: anchorPos,
+      // TODO compute the center based on the text size
+      center: anchorPos,
       anchor_side: "bottom"
     });
     this.source_net_alias_id = netAlias.source_net_id;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.157",
+  "version": "0.0.159",
   "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.98",
+    "circuit-json": "^0.0.99",
     "circuit-json-to-connectivity-map": "^0.0.17",
-    "circuit-to-svg": "^0.0.64",
+    "circuit-to-svg": "^0.0.67",
     "format-si-unit": "^0.0.2",
     "nanoid": "^5.0.7",
     "performance-now": "^2.1.0",