@tscircuit/core 0.0.1379 → 0.0.1381

package/dist/index.js

@@ -4450,6 +4450,7 @@ import { distance as distance2, doesLineIntersectLine } from "@tscircuit/math-ut
 var getOtherSchematicTraces = ({
   db,
   source_trace_id,
+  schematic_sheet_id,
   sameNetOnly,
   differentNetOnly
 }) => {
@@ -4460,6 +4461,9 @@ var getOtherSchematicTraces = ({
   const traces = [];
   for (const otherSchematicTrace of db.schematic_trace.list()) {
     if (otherSchematicTrace.source_trace_id === source_trace_id) continue;
+    if (schematic_sheet_id !== void 0 && otherSchematicTrace.schematic_sheet_id !== schematic_sheet_id) {
+      continue;
+    }
     const otherSourceTrace = db.source_trace.get(
       otherSchematicTrace.source_trace_id
     );
@@ -4606,11 +4610,13 @@ var getIntersectionPoint = (edge1, edge2) => {
 var createSchematicTraceJunctions = ({
   edges: myEdges,
   db,
-  source_trace_id
+  source_trace_id,
+  schematic_sheet_id
 }) => {
   const otherEdges = getOtherSchematicTraces({
     db,
     source_trace_id,
+    schematic_sheet_id,
     sameNetOnly: true
   }).flatMap((t) => t.edges);
   const junctions = /* @__PURE__ */ new Map();
@@ -4892,12 +4898,13 @@ import { doesLineIntersectLine as doesLineIntersectLine2 } from "@tscircuit/math
 var pushEdgesOfSchematicTraceToPreventOverlap = ({
   edges,
   db,
-  source_trace_id
+  source_trace_id,
+  schematic_sheet_id
 }) => {
-  const mySourceTrace = db.source_trace.get(source_trace_id);
   const otherEdges = getOtherSchematicTraces({
     db,
     source_trace_id,
+    schematic_sheet_id,
     differentNetOnly: true
   }).flatMap((t) => t.edges);
   const edgeOrientation = (edge) => {
@@ -4953,6 +4960,7 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
   const { db } = trace.root;
   const { _parsedProps: props, parent } = trace;
   const schematicNetLabelText = trace._getSchematicNetLabelText();
+  const schematicSheetId = trace._resolveSchematicSheetId();
   if (!parent) throw new Error("Trace has no parent");
   let allPortsFound;
   let connectedPorts;
@@ -5031,14 +5039,15 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
       const junctions2 = createSchematicTraceJunctions({
         edges: edges2,
         db,
-        source_trace_id: trace.source_trace_id
+        source_trace_id: trace.source_trace_id,
+        schematic_sheet_id: schematicSheetId
       });
       const dbTrace2 = db.schematic_trace.insert({
         source_trace_id: trace.source_trace_id,
         edges: edges2,
         junctions: junctions2,
         subcircuit_connectivity_map_key: trace.subcircuit_connectivity_map_key ?? void 0,
-        schematic_sheet_id: trace._resolveSchematicSheetId()
+        schematic_sheet_id: schematicSheetId
       });
       trace.schematic_trace_id = dbTrace2.schematic_trace_id;
       return;
@@ -5233,17 +5242,24 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
   const source_trace_id = trace.source_trace_id;
   let junctions = [];
   if (!skipOtherTraceInteraction) {
-    pushEdgesOfSchematicTraceToPreventOverlap({ edges, db, source_trace_id });
+    pushEdgesOfSchematicTraceToPreventOverlap({
+      edges,
+      db,
+      source_trace_id,
+      schematic_sheet_id: schematicSheetId
+    });
     const otherEdges = getOtherSchematicTraces({
       db,
       source_trace_id,
+      schematic_sheet_id: schematicSheetId,
       differentNetOnly: true
     }).flatMap((t) => t.edges);
     edges = createSchematicTraceCrossingSegments({ edges, otherEdges });
     junctions = createSchematicTraceJunctions({
       edges,
       db,
-      source_trace_id: trace.source_trace_id
+      source_trace_id: trace.source_trace_id,
+      schematic_sheet_id: schematicSheetId
     });
   }
   if (!edges || edges.length === 0) {
@@ -5275,7 +5291,7 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
     edges,
     junctions,
     subcircuit_connectivity_map_key: trace.subcircuit_connectivity_map_key ?? void 0,
-    schematic_sheet_id: trace._resolveSchematicSheetId()
+    schematic_sheet_id: schematicSheetId
   });
   trace.schematic_trace_id = dbTrace.schematic_trace_id;
   for (const { port } of connectedPorts) {
@@ -20338,8 +20354,10 @@ function applyTracesFromSolverOutput(args) {
     }))
   );
   const existingTracesForJunctions = [];
+  const schematicSheetId = group._resolveSchematicSheetId();
   for (const t of db.schematic_trace.list()) {
     if (t.edges.length === 0) continue;
+    if (t.schematic_sheet_id !== schematicSheetId) continue;
     const sourceTrace = t.source_trace_id ? db.source_trace.get(t.source_trace_id) : void 0;
     existingTracesForJunctions.push({
       schematic_trace_id: t.schematic_trace_id,
@@ -20377,7 +20395,7 @@ function applyTracesFromSolverOutput(args) {
       subcircuit_connectivity_map_key: pendingTraces.find(
         (p) => p.source_trace_id === t.source_trace_id
       )?.subcircuit_connectivity_map_key,
-      schematic_sheet_id: group._resolveSchematicSheetId()
+      schematic_sheet_id: schematicSheetId
     });
   }
 }
@@ -20671,6 +20689,8 @@ var insertNetLabelsForPortsMissingTrace = ({
     const connKey = sourcePort?.subcircuit_connectivity_map_key;
     if (!connKey) continue;
     const sourceNet = connKeyToSourceNet.get(connKey);
+    const schComponent = schPort.schematic_component_id ? db.schematic_component.get(schPort.schematic_component_id) : void 0;
+    const portSchematicSheetId = schComponent?.schematic_sheet_id ?? group._resolveSchematicSheetId();
     const connectedSourcePortIdsForKey = Array.from(
       allSourceAndSchematicPortIdsInScope
     ).map((portId) => schPortIdToSourcePortId.get(portId)).filter((sourcePortId) => {
@@ -20711,6 +20731,7 @@ var insertNetLabelsForPortsMissingTrace = ({
       text
     });
     const existingNetLabelForCurrentSourceConnection = db.schematic_net_label.list().find((nl) => {
+      if (nl.schematic_sheet_id !== portSchematicSheetId) return false;
       return doesSchematicNetLabelRepresentCurrentSourceConnection({
         nl,
         connKey,
@@ -20764,6 +20785,7 @@ var insertNetLabelsForPortsMissingTrace = ({
         continue;
       }
       const existingAtPort = db.schematic_net_label.list().some((nl) => {
+        if (nl.schematic_sheet_id !== portSchematicSheetId) return false;
         const dx2 = nl.anchor_position.x - schPort.center.x;
         const dy2 = nl.anchor_position.y - schPort.center.y;
         if (dx2 * dx2 + dy2 * dy2 >= SAME_ANCHOR_POSITION_DISTANCE * SAME_ANCHOR_POSITION_DISTANCE) {
@@ -20781,6 +20803,7 @@ var insertNetLabelsForPortsMissingTrace = ({
     if (!sourceNet) {
       for (const nl of db.schematic_net_label.list()) {
         if (nl.source_net_id !== connKey) continue;
+        if (nl.schematic_sheet_id !== portSchematicSheetId) continue;
         const isAttachedToConnectedPort = connectedSourcePortIdsForKey.some(
           (sourcePortId) => {
             const schPortId = Array.from(
@@ -20807,7 +20830,7 @@ var insertNetLabelsForPortsMissingTrace = ({
       anchor_position: schPort.center,
       center,
       anchor_side: side,
-      schematic_sheet_id: group._resolveSchematicSheetId()
+      schematic_sheet_id: portSchematicSheetId
     };
     db.schematic_net_label.insert(netLabel);
   }
@@ -24849,7 +24872,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1378",
+  version: "0.0.1380",
   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.1379",
+  "version": "0.0.1381",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",