@tscircuit/cli 0.1.1809 → 0.1.1810

package/dist/cli/main.js

@@ -118521,7 +118521,7 @@ var package_default = {
     "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.12.tgz",
     "@tscircuit/circuit-json-placement-analysis": "^0.0.6",
     "@tscircuit/circuit-json-routing-analysis": "^0.0.6",
-    "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#b6d5fe675adc26a2fc988aa081e6fb51e6bf696a",
+    "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#bb0b41d80c9714695b498e182c2a558f1e0ceb2d",
     "@tscircuit/eval": "^0.0.1016",
     "@tscircuit/fake-snippets": "^0.0.182",
     "@tscircuit/file-server": "^0.0.32",
@@ -283393,8 +283393,22 @@ import {
 
 // node_modules/@tscircuit/circuit-json-schematic-placement-analysis/lib/utils/placements.ts
 import { cju as cju7 } from "@tscircuit/circuit-json-util";
+
+// node_modules/@tscircuit/circuit-json-schematic-placement-analysis/lib/utils/schematic-sheets.ts
+var getSchematicSheetNamesById = (circuitJson) => {
+  const map = new Map;
+  for (const element of circuitJson) {
+    if (element.type === "schematic_sheet" && element.name) {
+      map.set(element.schematic_sheet_id, element.name);
+    }
+  }
+  return map;
+};
+
+// node_modules/@tscircuit/circuit-json-schematic-placement-analysis/lib/utils/placements.ts
 var isSchematicBox = (el3) => el3.type === "schematic_box";
 var isSchematicComponent = (el3) => el3.type === "schematic_component";
+var getSchematicSheetId = (el3) => el3.schematic_sheet_id;
 var getSourceComponentName = (circuitJson, sourceComponentId) => {
   if (!sourceComponentId)
     return;
@@ -283413,37 +283427,69 @@ var getSourceComponentMetadata = (schematicBox, circuitJson) => {
     sourceComponentName: sourceComponent?.name
   };
 };
-var schematicComponentToPlacement = (schematicComponent, circuitJson, schematicBox) => ({
-  lineItemType: "SchematicBoxPlacement",
-  positionAnchor: "center",
-  schX: schematicComponent.center.x,
-  schY: schematicComponent.center.y,
-  width: schematicBox?.width ?? schematicComponent.size.width,
-  height: schematicBox?.height ?? schematicComponent.size.height,
-  sourceComponentId: schematicComponent.source_component_id,
-  sourceComponentName: getSourceComponentName(circuitJson, schematicComponent.source_component_id),
-  schematicComponentId: schematicComponent.schematic_component_id,
-  schematicSymbolId: schematicBox?.schematic_symbol_id ?? schematicComponent.schematic_symbol_id,
-  subcircuitId: schematicComponent.subcircuit_id ?? schematicBox?.subcircuit_id
-});
-var schematicBoxToPlacement = (schematicBox, circuitJson) => ({
-  lineItemType: "SchematicBoxPlacement",
-  positionAnchor: "center",
-  schX: schematicBox.x,
-  schY: schematicBox.y,
-  width: schematicBox.width,
-  height: schematicBox.height,
-  ...getSourceComponentMetadata(schematicBox, circuitJson),
-  schematicComponentId: schematicBox.schematic_component_id,
-  schematicSymbolId: schematicBox.schematic_symbol_id,
-  subcircuitId: schematicBox.subcircuit_id
-});
+var schematicComponentToPlacement = (schematicComponent, circuitJson, schematicSheetNameById, schematicBox) => {
+  let schematicSheetId = getSchematicSheetId(schematicComponent);
+  if (schematicSheetId === undefined && schematicBox) {
+    schematicSheetId = getSchematicSheetId(schematicBox);
+  }
+  let schematicSheetName;
+  if (schematicSheetId) {
+    schematicSheetName = schematicSheetNameById.get(schematicSheetId);
+  }
+  const placement = {
+    lineItemType: "SchematicBoxPlacement",
+    positionAnchor: "center",
+    schX: schematicComponent.center.x,
+    schY: schematicComponent.center.y,
+    width: schematicBox?.width ?? schematicComponent.size.width,
+    height: schematicBox?.height ?? schematicComponent.size.height,
+    sourceComponentId: schematicComponent.source_component_id,
+    sourceComponentName: getSourceComponentName(circuitJson, schematicComponent.source_component_id),
+    schematicComponentId: schematicComponent.schematic_component_id,
+    schematicSymbolId: schematicBox?.schematic_symbol_id ?? schematicComponent.schematic_symbol_id,
+    subcircuitId: schematicComponent.subcircuit_id ?? schematicBox?.subcircuit_id
+  };
+  if (schematicSheetId) {
+    placement.schematicSheetId = schematicSheetId;
+  }
+  if (schematicSheetName) {
+    placement.schematicSheetName = schematicSheetName;
+  }
+  return placement;
+};
+var schematicBoxToPlacement = (schematicBox, circuitJson, schematicSheetNameById) => {
+  const schematicSheetId = getSchematicSheetId(schematicBox);
+  let schematicSheetName;
+  if (schematicSheetId) {
+    schematicSheetName = schematicSheetNameById.get(schematicSheetId);
+  }
+  const placement = {
+    lineItemType: "SchematicBoxPlacement",
+    positionAnchor: "center",
+    schX: schematicBox.x,
+    schY: schematicBox.y,
+    width: schematicBox.width,
+    height: schematicBox.height,
+    ...getSourceComponentMetadata(schematicBox, circuitJson),
+    schematicComponentId: schematicBox.schematic_component_id,
+    schematicSymbolId: schematicBox.schematic_symbol_id,
+    subcircuitId: schematicBox.subcircuit_id
+  };
+  if (schematicSheetId) {
+    placement.schematicSheetId = schematicSheetId;
+  }
+  if (schematicSheetName) {
+    placement.schematicSheetName = schematicSheetName;
+  }
+  return placement;
+};
 var buildSolverContext = (circuitJson) => {
   const schematicBoxes = circuitJson.filter(isSchematicBox);
+  const schematicSheetNameById = getSchematicSheetNamesById(circuitJson);
   const schematicComponentIds = new Set(circuitJson.filter(isSchematicComponent).map((sc2) => sc2.schematic_component_id));
   const componentPlacements = [
-    ...circuitJson.filter(isSchematicComponent).map((sc2) => schematicComponentToPlacement(sc2, circuitJson, schematicBoxes.find((sb3) => sb3.schematic_component_id === sc2.schematic_component_id))),
-    ...schematicBoxes.filter((sb3) => !sb3.schematic_component_id || !schematicComponentIds.has(sb3.schematic_component_id)).map((sb3) => schematicBoxToPlacement(sb3, circuitJson))
+    ...circuitJson.filter(isSchematicComponent).map((sc2) => schematicComponentToPlacement(sc2, circuitJson, schematicSheetNameById, schematicBoxes.find((sb3) => sb3.schematic_component_id === sc2.schematic_component_id))),
+    ...schematicBoxes.filter((sb3) => !sb3.schematic_component_id || !schematicComponentIds.has(sb3.schematic_component_id)).map((sb3) => schematicBoxToPlacement(sb3, circuitJson, schematicSheetNameById))
   ];
   return { circuitJson, componentPlacements };
 };
@@ -283712,6 +283758,8 @@ class SchematicBoxOverlapSolver extends BaseSolver7 {
     return `<OverlapCorrectionSuggestion ${attrs.join(" ")} />`;
   }
   getComponentOverlap(firstComponent, secondComponent) {
+    if (firstComponent.schematicSheetId !== secondComponent.schematicSheetId)
+      return null;
     const a3 = this.getCenteredRectBounds(firstComponent);
     const b3 = this.getCenteredRectBounds(secondComponent);
     const overlapWidth = Math.min(a3.right, b3.right) - Math.max(a3.left, b3.left);
@@ -284346,6 +284394,7 @@ class VerboseNetLabelSolver extends BaseSolver11 {
   VERBOSE_NET_LABEL_MESSAGE = "Create trace with schDisplayLabel";
   netLabels;
   tokenToInvolvedPin;
+  schematicSheetNameById;
   currentIndex = 0;
   seen = new Set;
   constructor(params2) {
@@ -284354,6 +284403,7 @@ class VerboseNetLabelSolver extends BaseSolver11 {
     const { circuitJson } = params2.ctx;
     this.netLabels = circuitJson.filter((el3) => this.isSchematicNetLabel(el3));
     this.tokenToInvolvedPin = this.buildTokenToInvolvedPinMap(circuitJson);
+    this.schematicSheetNameById = getSchematicSheetNamesById(circuitJson);
     this.solved = this.netLabels.length === 0;
   }
   _step() {
@@ -284363,13 +284413,20 @@ class VerboseNetLabelSolver extends BaseSolver11 {
       return;
     }
     this.solved = this.currentIndex >= this.netLabels.length;
-    if (!label.text.includes("/") || this.seen.has(label.text))
+    const seenKey = `${label.schematic_sheet_id ?? ""}:${label.text}`;
+    if (!label.text.includes("/") || this.seen.has(seenKey))
       return;
-    this.seen.add(label.text);
+    this.seen.add(seenKey);
+    let schematicSheetName;
+    if (label.schematic_sheet_id) {
+      schematicSheetName = this.schematicSheetNameById.get(label.schematic_sheet_id);
+    }
     const issue = {
       lineItemType: "VerboseSchematicNetLabel",
       schematicNetLabelId: label.schematic_net_label_id,
       sourceNetId: label.source_net_id,
+      schematicSheetId: label.schematic_sheet_id,
+      schematicSheetName,
       text: label.text,
       involvedPins: this.getInvolvedPins(label.text, this.tokenToInvolvedPin),
       schX: label.center.x,
@@ -284383,6 +284440,7 @@ class VerboseNetLabelSolver extends BaseSolver11 {
     addAttr(attrs, "message", issue.message, { escape: false });
     addAttr(attrs, "text", issue.text);
     addAttr(attrs, "involvedPins", issue.involvedPins.join(","));
+    addAttr(attrs, "schSheetName", issue.schematicSheetName);
     addAttr(attrs, "schX", issue.schX);
     addAttr(attrs, "schY", issue.schY);
     return `<VerboseSchematicNetLabel ${attrs.join(" ")} />`;
@@ -284482,8 +284540,9 @@ class DiodeResistorAlignmentSolver extends BaseSolver12 {
       return;
     const start = firstEdge.from;
     const end = lastEdge.to;
-    const startSourceCompId = this.findSourceComponentIdNearPoint(start);
-    const endSourceCompId = this.findSourceComponentIdNearPoint(end);
+    const schematicSheetId = trace.schematic_sheet_id;
+    const startSourceCompId = this.findSourceComponentIdNearPoint(start, schematicSheetId);
+    const endSourceCompId = this.findSourceComponentIdNearPoint(end, schematicSheetId);
     if (!startSourceCompId || !endSourceCompId)
       return;
     const startFtype = this.sourceComponentFtypeById.get(startSourceCompId);
@@ -284498,8 +284557,8 @@ class DiodeResistorAlignmentSolver extends BaseSolver12 {
     const resistorBox = this.schematicBoxBySourceComponentId.get(resistorCompId);
     if (!diodeBox || !resistorBox)
       return;
-    const diodePort = this.findNearestPort(DIODE_FTYPES.has(startFtype) ? start : end);
-    const resistorPort = this.findNearestPort(startFtype === "simple_resistor" ? start : end);
+    const diodePort = this.findNearestPort(DIODE_FTYPES.has(startFtype) ? start : end, schematicSheetId);
+    const resistorPort = this.findNearestPort(startFtype === "simple_resistor" ? start : end, schematicSheetId);
     if (!diodePort?.center || !resistorPort?.center)
       return;
     const diodeName = diodeBox.sourceComponentName ?? diodeCompId;
@@ -284541,10 +284600,12 @@ class DiodeResistorAlignmentSolver extends BaseSolver12 {
   static dist(a3, b3) {
     return Math.sqrt((a3.x - b3.x) ** 2 + (a3.y - b3.y) ** 2);
   }
-  findNearestPort(point9) {
+  findNearestPort(point9, schematicSheetId) {
     let nearest;
     let minDist = Infinity;
     for (const port of this.schematicPorts) {
+      if (port.schematic_sheet_id !== schematicSheetId)
+        continue;
       if (!port.center)
         continue;
       const d3 = DiodeResistorAlignmentSolver.dist(point9, port.center);
@@ -284555,8 +284616,8 @@ class DiodeResistorAlignmentSolver extends BaseSolver12 {
     }
     return nearest;
   }
-  findSourceComponentIdNearPoint(point9) {
-    const nearest = this.findNearestPort(point9);
+  findSourceComponentIdNearPoint(point9, schematicSheetId) {
+    const nearest = this.findNearestPort(point9, schematicSheetId);
     if (!nearest || !nearest.source_port_id)
       return;
     return this.sourceComponentIdBySourcePortId.get(nearest.source_port_id);
@@ -284651,6 +284712,8 @@ class ComponentNetLabelCollisionSolver extends BaseSolver13 {
     }
   }
   detectPair(compA, compB) {
+    if (compA.schematicSheetId !== compB.schematicSheetId)
+      return;
     this.rawCollisions.push(...this.detectLabelLabel(compA, compB));
     this.rawCollisions.push(...this.detectBoxLabel(compA, compB));
     this.rawCollisions.push(...this.detectBoxLabel(compB, compA));
@@ -284871,7 +284934,8 @@ class ComponentNetLabelCollisionSolver extends BaseSolver13 {
       portPositions.push({
         componentId: port.schematic_component_id,
         cx: port.center.x,
-        cy: port.center.y
+        cy: port.center.y,
+        schematicSheetId: port.schematic_sheet_id
       });
     }
     const result = new Map;
@@ -284882,7 +284946,7 @@ class ComponentNetLabelCollisionSolver extends BaseSolver13 {
       if (!label.anchor_position)
         continue;
       const { x: anchorX, y: anchorY } = label.anchor_position;
-      const matches = portPositions.filter((port) => Math.hypot(port.cx - anchorX, port.cy - anchorY) < MATCH_EPSILON);
+      const matches = portPositions.filter((port) => port.schematicSheetId === label.schematic_sheet_id && Math.hypot(port.cx - anchorX, port.cy - anchorY) < MATCH_EPSILON);
       if (matches.length === 0)
         continue;
       const componentIds = new Set(matches.map((match) => match.componentId));
@@ -285003,6 +285067,7 @@ class SchematicPlacementAnalysis {
     addAttr(attrs, "schY", lineItem.schY);
     addAttr(attrs, "width", lineItem.width);
     addAttr(attrs, "height", lineItem.height);
+    addAttr(attrs, "schSheetName", lineItem.schematicSheetName);
     return `<SchematicBoxPlacement ${attrs.join(" ")} />`;
   }
   schematicIssuesToString(issue) {

package/dist/lib/index.js

@@ -65772,7 +65772,7 @@ var package_default = {
     "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.12.tgz",
     "@tscircuit/circuit-json-placement-analysis": "^0.0.6",
     "@tscircuit/circuit-json-routing-analysis": "^0.0.6",
-    "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#b6d5fe675adc26a2fc988aa081e6fb51e6bf696a",
+    "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#bb0b41d80c9714695b498e182c2a558f1e0ceb2d",
     "@tscircuit/eval": "^0.0.1016",
     "@tscircuit/fake-snippets": "^0.0.182",
     "@tscircuit/file-server": "^0.0.32",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1809",
+  "version": "0.1.1810",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -12,7 +12,7 @@
     "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.12.tgz",
     "@tscircuit/circuit-json-placement-analysis": "^0.0.6",
     "@tscircuit/circuit-json-routing-analysis": "^0.0.6",
-    "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#b6d5fe675adc26a2fc988aa081e6fb51e6bf696a",
+    "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#bb0b41d80c9714695b498e182c2a558f1e0ceb2d",
     "@tscircuit/eval": "^0.0.1016",
     "@tscircuit/fake-snippets": "^0.0.182",
     "@tscircuit/file-server": "^0.0.32",