@tscircuit/core 0.0.682 → 0.0.683

package/dist/index.js

@@ -5188,7 +5188,8 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
       const dbTrace2 = db.schematic_trace.insert({
         source_trace_id: trace.source_trace_id,
         edges: edges2,
-        junctions: []
+        junctions: [],
+        subcircuit_connectivity_map_key: trace.subcircuit_connectivity_map_key ?? void 0
       });
       trace.schematic_trace_id = dbTrace2.schematic_trace_id;
       return;
@@ -5418,7 +5419,8 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
   const dbTrace = db.schematic_trace.insert({
     source_trace_id: trace.source_trace_id,
     edges,
-    junctions
+    junctions,
+    subcircuit_connectivity_map_key: trace.subcircuit_connectivity_map_key ?? void 0
   });
   trace.schematic_trace_id = dbTrace.schematic_trace_id;
   for (const { port } of connectedPorts) {
@@ -10105,7 +10107,10 @@ function computeCrossings(traces, opts = {}) {
       }
     }
   }
-  const out = traces.map((t) => ({ id: t.id, edges: [] }));
+  const out = traces.map((t) => ({
+    source_trace_id: t.source_trace_id,
+    edges: []
+  }));
   for (let ti = 0; ti < traces.length; ti++) {
     const trace = traces[ti];
     for (let ei = 0; ei < trace.edges.length; ei++) {
@@ -10206,7 +10211,7 @@ function getCornerOrientationAtPoint(trace, p, tol = TOL2) {
 function computeJunctions(traces, opts = {}) {
   const tol = opts.tolerance ?? TOL2;
   const result = {};
-  for (const t of traces) result[t.id] = [];
+  for (const t of traces) result[t.source_trace_id] = [];
   const endpointsByTrace = traces.map((t) => {
     const pts = [];
     for (const e of t.edges) {
@@ -10232,8 +10237,9 @@ function computeJunctions(traces, opts = {}) {
             const bCorner = getCornerOrientationAtPoint(B, pb, tol);
             const sameCornerOrientation = aCorner !== null && bCorner !== null && aCorner === bCorner;
             if (hasCorner && !sameCornerOrientation) {
-              result[A.id].push(pa);
-              if (A.id !== B.id) result[B.id].push(pb);
+              result[A.source_trace_id].push(pa);
+              if (A.source_trace_id !== B.source_trace_id)
+                result[B.source_trace_id].push(pb);
             }
           }
         }
@@ -10248,8 +10254,9 @@ function computeJunctions(traces, opts = {}) {
             const bCorner = bEndpointNearPa ? getCornerOrientationAtPoint(B, bEndpointNearPa, tol) : null;
             const sameCornerOrientation = aCorner !== null && bCorner !== null && aCorner === bCorner;
             if (hasCorner && !sameCornerOrientation) {
-              result[A.id].push(pa);
-              if (A.id !== B.id) result[B.id].push(pa);
+              result[A.source_trace_id].push(pa);
+              if (A.source_trace_id !== B.source_trace_id)
+                result[B.source_trace_id].push(pa);
             }
           }
         }
@@ -10264,8 +10271,9 @@ function computeJunctions(traces, opts = {}) {
             const aCorner = aEndpointNearPb ? getCornerOrientationAtPoint(A, aEndpointNearPb, tol) : null;
             const sameCornerOrientation = aCorner !== null && bCorner !== null && aCorner === bCorner;
             if (hasCorner && !sameCornerOrientation) {
-              result[B.id].push(pb);
-              if (A.id !== B.id) result[A.id].push(pb);
+              result[B.source_trace_id].push(pb);
+              if (A.source_trace_id !== B.source_trace_id)
+                result[A.source_trace_id].push(pb);
             }
           }
         }
@@ -10280,12 +10288,12 @@ function computeJunctions(traces, opts = {}) {
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/applyTracesFromSolverOutput.ts
 function applyTracesFromSolverOutput(args) {
-  const { group, solver, pinIdToSchematicPortId, pairKeyToSourceTraceId } = args;
+  const { group, solver, pinIdToSchematicPortId, userNetIdToSck } = args;
   const { db } = group.root;
   const correctedMap = solver.traceOverlapShiftSolver?.correctedTraceMap;
   const pendingTraces = [];
-  for (const solved of Object.values(correctedMap ?? {})) {
-    const points = solved?.tracePath;
+  for (const solvedTracePath of Object.values(correctedMap ?? {})) {
+    const points = solvedTracePath?.tracePath;
     if (!Array.isArray(points) || points.length < 2) continue;
     const edges = [];
     for (let i = 0; i < points.length - 1; i++) {
@@ -10295,35 +10303,47 @@ function applyTracesFromSolverOutput(args) {
       });
     }
     let source_trace_id = null;
-    if (Array.isArray(solved?.pins) && solved.pins.length === 2) {
-      const pA = pinIdToSchematicPortId.get(solved.pins[0]?.pinId);
-      const pB = pinIdToSchematicPortId.get(solved.pins[1]?.pinId);
+    let subcircuit_connectivity_map_key;
+    if (Array.isArray(solvedTracePath?.pins) && solvedTracePath.pins.length === 2) {
+      const pA = pinIdToSchematicPortId.get(solvedTracePath.pins[0]?.pinId);
+      const pB = pinIdToSchematicPortId.get(solvedTracePath.pins[1]?.pinId);
       if (pA && pB) {
-        const pairKey = [pA, pB].sort().join("::");
-        source_trace_id = pairKeyToSourceTraceId.get(pairKey) || `solver_${solved.mspPairId || pairKey}`;
         for (const schPid of [pA, pB]) {
           const existing = db.schematic_port.get(schPid);
           if (existing) db.schematic_port.update(schPid, { is_connected: true });
         }
+        subcircuit_connectivity_map_key = userNetIdToSck.get(
+          String(solvedTracePath.userNetId)
+        );
       }
     }
     if (!source_trace_id) {
-      source_trace_id = `solver_${solved?.mspPairId}`;
+      source_trace_id = `solver_${solvedTracePath?.mspPairId}`;
+      subcircuit_connectivity_map_key = userNetIdToSck.get(
+        String(solvedTracePath.userNetId)
+      );
     }
     pendingTraces.push({
-      id: source_trace_id,
-      edges
+      source_trace_id,
+      edges,
+      subcircuit_connectivity_map_key
     });
   }
   const withCrossings = computeCrossings(
-    pendingTraces.map((t) => ({ id: t.id, edges: t.edges }))
+    pendingTraces.map((t) => ({
+      source_trace_id: t.source_trace_id,
+      edges: t.edges
+    }))
   );
   const junctionsById = computeJunctions(withCrossings);
   for (const t of withCrossings) {
     db.schematic_trace.insert({
-      source_trace_id: t.id,
+      source_trace_id: t.source_trace_id,
       edges: t.edges,
-      junctions: junctionsById[t.id] ?? []
+      junctions: junctionsById[t.source_trace_id] ?? [],
+      subcircuit_connectivity_map_key: pendingTraces.find(
+        (p) => p.source_trace_id === t.source_trace_id
+      )?.subcircuit_connectivity_map_key
     });
   }
 }
@@ -10566,7 +10586,7 @@ var Group_doInitialSchematicTraceRender = (group) => {
     group,
     solver,
     pinIdToSchematicPortId,
-    pairKeyToSourceTraceId
+    userNetIdToSck
   });
   applyNetLabelPlacements({
     group,
@@ -12838,16 +12858,19 @@ var NetLabel = class extends PrimitiveComponent2 {
         });
       }
       let source_trace_id;
+      let subcircuit_connectivity_map_key;
       if (net?.source_net_id && port.source_port_id) {
         const st = db.source_trace.list().find(
           (s) => s.connected_source_net_ids?.includes(net.source_net_id) && s.connected_source_port_ids?.includes(port.source_port_id)
         );
         source_trace_id = st?.source_trace_id;
+        subcircuit_connectivity_map_key = st?.subcircuit_connectivity_map_key || db.source_net.get(net.source_net_id)?.subcircuit_connectivity_map_key;
       }
       db.schematic_trace.insert({
         source_trace_id,
         edges,
-        junctions: []
+        junctions: [],
+        subcircuit_connectivity_map_key
       });
       db.schematic_port.update(port.schematic_port_id, { is_connected: true });
     }
@@ -14027,7 +14050,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.681",
+  version: "0.0.682",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -14080,7 +14103,7 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.9",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.237",
+    "circuit-json": "^0.0.238",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.6",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.682",
+  "version": "0.0.683",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -54,7 +54,7 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.9",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.237",
+    "circuit-json": "^0.0.238",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.6",