@tscircuit/cli 0.1.1930 → 0.1.1931

package/dist/cli/main.js

@@ -136059,7 +136059,7 @@ var package_default = {
     "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.19.tgz",
     "@tscircuit/circuit-json-placement-analysis": "^0.0.9",
     "@tscircuit/circuit-json-routing-analysis": "^0.0.8",
-    "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#bb0b41d80c9714695b498e182c2a558f1e0ceb2d",
+    "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#2bfa85c47dd0bd0d360b85083980170c01d3afca",
     "@tscircuit/circuit-json-util": "^0.0.105",
     "@tscircuit/eval": "^0.0.1016",
     "@tscircuit/fake-snippets": "^0.0.182",
@@ -303287,6 +303287,141 @@ class ComponentNetLabelCollisionSolver extends BaseSolver13 {
   }
 }
 
+// node_modules/@tscircuit/circuit-json-schematic-placement-analysis/lib/solvers/ComponentPinAlignmentSolver/ComponentPinAlignmentSolver.ts
+import { BaseSolver as BaseSolver14 } from "@tscircuit/solver-utils";
+class ComponentPinAlignmentSolver extends BaseSolver14 {
+  static ALIGNMENT_EPSILON = 0.01;
+  ctx;
+  out;
+  constructor({
+    ctx,
+    issues
+  }) {
+    super();
+    this.ctx = ctx;
+    this.out = issues;
+  }
+  _step() {
+    const portsById = new Map(this.ctx.circuitJson.filter((el3) => el3.type === "schematic_port").map((port) => [port.schematic_port_id, port]));
+    const placementBySchematicComponentId = new Map(this.ctx.componentPlacements.flatMap((placement) => placement.schematicComponentId ? [[placement.schematicComponentId, placement]] : []));
+    const pinPairsByComponentPair = new Map;
+    for (const trace of this.ctx.circuitJson.filter((el3) => el3.type === "schematic_trace")) {
+      const pinPair = this.getTracePinPair(trace, portsById);
+      if (!pinPair)
+        continue;
+      const firstComponentId = pinPair.firstPort.schematic_component_id;
+      const secondComponentId = pinPair.secondPort.schematic_component_id;
+      if (!firstComponentId || !secondComponentId || firstComponentId === secondComponentId) {
+        continue;
+      }
+      const orderedPair = firstComponentId < secondComponentId ? pinPair : {
+        firstPort: pinPair.secondPort,
+        secondPort: pinPair.firstPort
+      };
+      const key = [firstComponentId, secondComponentId].sort().join("\x00");
+      const pairs3 = pinPairsByComponentPair.get(key) ?? [];
+      const isDuplicate = pairs3.some((pair) => pair.firstPort.schematic_port_id === orderedPair.firstPort.schematic_port_id && pair.secondPort.schematic_port_id === orderedPair.secondPort.schematic_port_id);
+      if (!isDuplicate)
+        pairs3.push(orderedPair);
+      pinPairsByComponentPair.set(key, pairs3);
+    }
+    for (const pinPairs of pinPairsByComponentPair.values()) {
+      const issue = this.findVerticalShiftIssue(pinPairs, placementBySchematicComponentId);
+      if (issue)
+        this.out.push(issue);
+    }
+    this.solved = true;
+  }
+  getTracePinPair(trace, portsById) {
+    const firstEdge = trace.edges?.[0];
+    const lastEdge = trace.edges?.at(-1);
+    if (!firstEdge || !lastEdge)
+      return;
+    const firstPortId = firstEdge.from_schematic_port_id ?? firstEdge.to_schematic_port_id;
+    const secondPortId = lastEdge.to_schematic_port_id ?? lastEdge.from_schematic_port_id;
+    const ports = [...portsById.values()];
+    const firstPort = firstPortId ? portsById.get(firstPortId) : this.findPortAtPoint(ports, firstEdge.from, trace.schematic_sheet_id);
+    const secondPort = secondPortId ? portsById.get(secondPortId) : this.findPortAtPoint(ports, lastEdge.to, trace.schematic_sheet_id);
+    if (!firstPort || !secondPort)
+      return;
+    if (firstPort.schematic_port_id === secondPort.schematic_port_id)
+      return;
+    if (firstPort.schematic_sheet_id !== secondPort.schematic_sheet_id)
+      return;
+    return { firstPort, secondPort };
+  }
+  findPortAtPoint(ports, point9, schematicSheetId) {
+    const { ALIGNMENT_EPSILON } = ComponentPinAlignmentSolver;
+    return ports.find((port) => port.schematic_sheet_id === schematicSheetId && Math.abs(port.center.x - point9.x) <= ALIGNMENT_EPSILON && Math.abs(port.center.y - point9.y) <= ALIGNMENT_EPSILON);
+  }
+  findVerticalShiftIssue(pinPairs, placementBySchematicComponentId) {
+    const firstPair = pinPairs[0];
+    if (!firstPair)
+      return;
+    const firstPlacement = placementBySchematicComponentId.get(firstPair.firstPort.schematic_component_id);
+    const secondPlacement = placementBySchematicComponentId.get(firstPair.secondPort.schematic_component_id);
+    if (!firstPlacement || !secondPlacement)
+      return;
+    const [leftPlacement, rightPlacement] = firstPlacement.schX <= secondPlacement.schX ? [firstPlacement, secondPlacement] : [secondPlacement, firstPlacement];
+    const horizontalPairs = pinPairs.flatMap((pair) => {
+      const [leftPort, rightPort] = pair.firstPort.center.x <= pair.secondPort.center.x ? [pair.firstPort, pair.secondPort] : [pair.secondPort, pair.firstPort];
+      return leftPort.facing_direction === "right" && rightPort.facing_direction === "left" ? [{ leftPort, rightPort }] : [];
+    });
+    if (horizontalPairs.length < 2)
+      return;
+    const { ALIGNMENT_EPSILON } = ComponentPinAlignmentSolver;
+    const currentlyAlignedPinCount = horizontalPairs.filter(({ leftPort, rightPort }) => Math.abs(leftPort.center.y - rightPort.center.y) <= ALIGNMENT_EPSILON).length;
+    const candidateGroups = [];
+    for (const pair of horizontalPairs) {
+      const deltaSchY2 = pair.leftPort.center.y - pair.rightPort.center.y;
+      if (Math.abs(deltaSchY2) <= ALIGNMENT_EPSILON)
+        continue;
+      const group = candidateGroups.find((candidate) => Math.abs(candidate.deltaSchY - deltaSchY2) <= ALIGNMENT_EPSILON);
+      if (group)
+        group.pairs.push(pair);
+      else
+        candidateGroups.push({ deltaSchY: deltaSchY2, pairs: [pair] });
+    }
+    const bestCandidate = candidateGroups.sort((a2, b3) => b3.pairs.length - a2.pairs.length || Math.abs(a2.deltaSchY) - Math.abs(b3.deltaSchY))[0];
+    if (!bestCandidate || bestCandidate.pairs.length < 2 || bestCandidate.pairs.length <= currentlyAlignedPinCount) {
+      return;
+    }
+    const targetName = rightPlacement.sourceComponentName ?? rightPlacement.schematicComponentId ?? "component";
+    const deltaSchY = bestCandidate.deltaSchY;
+    const newSchY = rightPlacement.schY + deltaSchY;
+    return {
+      lineItemType: "ComponentPinsWouldAlignWithVerticalShift",
+      firstComponent: leftPlacement,
+      secondComponent: rightPlacement,
+      targetComponent: rightPlacement,
+      deltaSchY,
+      newSchY,
+      currentlyAlignedPinCount,
+      alignedPinCount: bestCandidate.pairs.length,
+      alignedPinPairs: bestCandidate.pairs.map(({ leftPort, rightPort }) => ({
+        firstPin: this.getPinLabel(leftPort),
+        secondPin: this.getPinLabel(rightPort)
+      })),
+      message: `shift ${targetName} vertically by ${fmtDelta(deltaSchY)} to align ${bestCandidate.pairs.length} connected pin pairs`
+    };
+  }
+  getPinLabel(port) {
+    return port.display_pin_label ?? port.pin_number?.toString();
+  }
+  static issueToString(issue) {
+    const attrs = [];
+    addAttr(attrs, "firstComponentName", issue.firstComponent.sourceComponentName);
+    addAttr(attrs, "secondComponentName", issue.secondComponent.sourceComponentName);
+    addAttr(attrs, "targetComponentName", issue.targetComponent.sourceComponentName);
+    addAttr(attrs, "deltaSchY", issue.deltaSchY);
+    addAttr(attrs, "newSchY", issue.newSchY);
+    addAttr(attrs, "currentlyAlignedPinCount", issue.currentlyAlignedPinCount);
+    addAttr(attrs, "alignedPinCount", issue.alignedPinCount);
+    addAttr(attrs, "message", issue.message);
+    return `<ComponentPinsWouldAlignWithVerticalShift ${attrs.join(" ")} />`;
+  }
+}
+
 // node_modules/@tscircuit/circuit-json-schematic-placement-analysis/lib/solvers/SchematicPlacementPipeline/SchematicPlacementPipeline.ts
 class SchematicPlacementPipeline extends BasePipelineSolver2 {
   ctx;
@@ -303313,6 +303448,9 @@ class SchematicPlacementPipeline extends BasePipelineSolver2 {
     definePipelineStep3("DiodeResistorAlignmentSolver", DiodeResistorAlignmentSolver, (p3) => [
       { ctx: p3.ctx, issues: p3.issues }
     ]),
+    definePipelineStep3("ComponentPinAlignmentSolver", ComponentPinAlignmentSolver, (p3) => [
+      { ctx: p3.ctx, issues: p3.issues }
+    ]),
     definePipelineStep3("ComponentNetLabelCollisionSolver", ComponentNetLabelCollisionSolver, (p3) => [
       { ctx: p3.ctx, issues: p3.issues }
     ])
@@ -303368,6 +303506,8 @@ class SchematicPlacementAnalysis {
         return SchematicPinPaddingToEdgeSolver.issueToString(issue);
       case "DiodeResistorNotAligned":
         return DiodeResistorAlignmentSolver.issueToString(issue);
+      case "ComponentPinsWouldAlignWithVerticalShift":
+        return ComponentPinAlignmentSolver.issueToString(issue);
       case "NetLabelCollision":
         return ComponentNetLabelCollisionSolver.netLabelCollisionToString(issue);
       default:

package/dist/lib/index.js

@@ -65772,7 +65772,7 @@ var package_default = {
     "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.19.tgz",
     "@tscircuit/circuit-json-placement-analysis": "^0.0.9",
     "@tscircuit/circuit-json-routing-analysis": "^0.0.8",
-    "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#bb0b41d80c9714695b498e182c2a558f1e0ceb2d",
+    "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#2bfa85c47dd0bd0d360b85083980170c01d3afca",
     "@tscircuit/circuit-json-util": "^0.0.105",
     "@tscircuit/eval": "^0.0.1016",
     "@tscircuit/fake-snippets": "^0.0.182",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1930",
+  "version": "0.1.1931",
   "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.19.tgz",
     "@tscircuit/circuit-json-placement-analysis": "^0.0.9",
     "@tscircuit/circuit-json-routing-analysis": "^0.0.8",
-    "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#bb0b41d80c9714695b498e182c2a558f1e0ceb2d",
+    "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#2bfa85c47dd0bd0d360b85083980170c01d3afca",
     "@tscircuit/circuit-json-util": "^0.0.105",
     "@tscircuit/eval": "^0.0.1016",
     "@tscircuit/fake-snippets": "^0.0.182",