@tscircuit/core 0.0.1458 → 0.0.1460

package/dist/index.js

@@ -21401,10 +21401,22 @@ function applyTracesFromSolverOutput(args) {
         subcircuit_connectivity_map_key = sourcePortConnKeys[0];
       }
     }
+    const endpointSchematicSheetIds = new Set(
+      solvedTraceSchematicPortIds.map(
+        (schematicPortId) => db.schematic_port.get(schematicPortId)?.schematic_sheet_id
+      ).filter((sheetId) => Boolean(sheetId))
+    );
+    let schematicSheetId2;
+    if (endpointSchematicSheetIds.size === 1) {
+      schematicSheetId2 = endpointSchematicSheetIds.values().next().value;
+    } else if (endpointSchematicSheetIds.size === 0) {
+      schematicSheetId2 = group._resolveSchematicSheetId();
+    }
     pendingTraces.push({
       source_trace_id,
       edges,
-      subcircuit_connectivity_map_key
+      subcircuit_connectivity_map_key,
+      schematic_sheet_id: schematicSheetId2
     });
   }
   debug8(
@@ -21452,14 +21464,19 @@ function applyTracesFromSolverOutput(args) {
     ...visibleExistingTraces
   ]);
   for (const t of visibleTraces) {
+    const pendingTrace = pendingTraces.find(
+      (pendingTrace2) => pendingTrace2.source_trace_id === t.source_trace_id
+    );
+    let traceSchematicSheetId = schematicSheetId;
+    if (pendingTrace?.schematic_sheet_id) {
+      traceSchematicSheetId = pendingTrace.schematic_sheet_id;
+    }
     db.schematic_trace.insert({
       source_trace_id: t.source_trace_id,
       edges: t.edges,
       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,
-      schematic_sheet_id: schematicSheetId
+      subcircuit_connectivity_map_key: pendingTrace?.subcircuit_connectivity_map_key,
+      schematic_sheet_id: traceSchematicSheetId
     });
   }
 }
@@ -21609,6 +21626,11 @@ function applyNetLabelPlacements(args) {
     const schPortIds = placement.pinIds.map(
       (pinId) => pinIdToSchematicPortId.get(pinId)
     );
+    let schematicSheetId = group._resolveSchematicSheetId();
+    const schematicPort = db.schematic_port.get(schPortIds[0]);
+    if (schematicPort?.schematic_sheet_id) {
+      schematicSheetId = schematicPort.schematic_sheet_id;
+    }
     let anchor_position = placement.anchorPoint;
     if (schPortIds.length === 1 && schPortIds[0]) {
       const anchorSchPort = db.schematic_port.get(schPortIds[0]);
@@ -21665,7 +21687,7 @@ function applyNetLabelPlacements(args) {
         anchor_position,
         center: center2,
         anchor_side,
-        schematic_sheet_id: group._resolveSchematicSheetId()
+        schematic_sheet_id: schematicSheetId
       };
       db.schematic_net_label.insert(netLabel2);
       continue;
@@ -21693,7 +21715,7 @@ function applyNetLabelPlacements(args) {
       anchor_position,
       center,
       anchor_side,
-      schematic_sheet_id: group._resolveSchematicSheetId()
+      schematic_sheet_id: schematicSheetId
     };
     db.schematic_net_label.insert(netLabel);
   }
@@ -22812,7 +22834,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1457",
+  version: "0.0.1459",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -22863,7 +22885,7 @@ var package_default = {
     "@tscircuit/ngspice-spice-engine": "^0.0.19",
     "@tscircuit/props": "^0.0.578",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
-    "@tscircuit/schematic-trace-solver": "^0.0.99",
+    "@tscircuit/schematic-trace-solver": "^0.0.101",
     "@tscircuit/solver-utils": "^0.0.16",
     "@tscircuit/soup-util": "^0.0.41",
     "@types/bun": "^1.2.16",
@@ -24026,7 +24048,8 @@ var Group = class extends NormalComponent3 {
   }
   doInitialSourceRender() {
     const { db } = this.root;
-    for (const child of this.children) {
+    for (const child of this.getDescendants()) {
+      if (child.getGroup()?.source_group_id !== this.source_group_id) continue;
       db.source_component.update(child.source_component_id, {
         source_group_id: this.source_group_id
       });
@@ -24896,7 +24919,8 @@ var Group = class extends NormalComponent3 {
     if (props.showAsSchematicBox) {
       Group_doInitialSchematicBoxComponentRender(this);
     }
-    for (const child of this.children) {
+    for (const child of this.getDescendants()) {
+      if (child.getGroup()?.source_group_id !== this.source_group_id) continue;
       if (child._parsedProps?.showAsSchematicBox) continue;
       if (child.schematic_component_id) {
         db.schematic_component.update(child.schematic_component_id, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1458",
+  "version": "0.0.1460",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -52,7 +52,7 @@
     "@tscircuit/ngspice-spice-engine": "^0.0.19",
     "@tscircuit/props": "^0.0.578",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
-    "@tscircuit/schematic-trace-solver": "^0.0.99",
+    "@tscircuit/schematic-trace-solver": "^0.0.101",
     "@tscircuit/solver-utils": "^0.0.16",
     "@tscircuit/soup-util": "^0.0.41",
     "@types/bun": "^1.2.16",