@tscircuit/core 0.0.1335 → 0.0.1336

package/dist/index.js

@@ -18045,6 +18045,141 @@ import { getCircuitJsonTree as getCircuitJsonTree2 } from "@tscircuit/circuit-js
 import "@tscircuit/circuit-json-util";
 import { LayoutPipelineSolver } from "@tscircuit/matchpack";
 import Debug8 from "debug";
+
+// lib/utils/schematic/getSchematicComponentWithTextBounds.ts
+import { getBoundFromCenteredRect } from "@tscircuit/math-utils";
+import { symbols as symbols3 } from "schematic-symbols";
+var SYMBOL_TEXT_FONT_SIZE = 0.18;
+var TEXT_BOX_ENABLED_FTYPES = /* @__PURE__ */ new Set(["simple_resistor"]);
+function getTextBounds({
+  text,
+  position,
+  anchor,
+  fontSize
+}) {
+  const width = getSchematicNetLabelTextWidth({ text, font_size: fontSize });
+  const height = fontSize;
+  let relMinX;
+  let relMaxX;
+  if (anchor.includes("left")) {
+    relMinX = 0;
+    relMaxX = width;
+  } else if (anchor.includes("right")) {
+    relMinX = -width;
+    relMaxX = 0;
+  } else {
+    relMinX = -width / 2;
+    relMaxX = width / 2;
+  }
+  let relMinY;
+  let relMaxY;
+  if (anchor.includes("top")) {
+    relMinY = -height;
+    relMaxY = 0;
+  } else if (anchor.includes("bottom")) {
+    relMinY = 0;
+    relMaxY = height;
+  } else {
+    relMinY = -height / 2;
+    relMaxY = height / 2;
+  }
+  return {
+    minX: position.x + relMinX,
+    maxX: position.x + relMaxX,
+    minY: position.y + relMinY,
+    maxY: position.y + relMaxY
+  };
+}
+function getSymbolTextBounds({
+  schematicComponent,
+  sourceComponent
+}) {
+  if (!schematicComponent.symbol_name) return [];
+  const symbol = symbols3[schematicComponent.symbol_name];
+  if (!symbol?.primitives || !symbol.center) return [];
+  const textBounds = [];
+  for (const primitive of symbol.primitives) {
+    if (primitive.type !== "text") continue;
+    let value;
+    if (primitive.text === "{REF}") {
+      value = sourceComponent?.display_name ?? sourceComponent?.name ?? "";
+    } else if (primitive.text === "{VAL}") {
+      value = schematicComponent.symbol_display_value ?? "";
+    } else {
+      value = primitive.text ?? "";
+    }
+    if (!value) continue;
+    textBounds.push(
+      getTextBounds({
+        text: value,
+        position: {
+          x: primitive.x - symbol.center.x + schematicComponent.center.x,
+          y: primitive.y - symbol.center.y + schematicComponent.center.y
+        },
+        anchor: primitive.anchor ?? "center",
+        fontSize: SYMBOL_TEXT_FONT_SIZE
+      })
+    );
+  }
+  return textBounds;
+}
+function getSymbolBoxBounds(schematicComponent) {
+  return getBoundFromCenteredRect({
+    center: schematicComponent.center,
+    width: schematicComponent.size.width,
+    height: schematicComponent.size.height
+  });
+}
+function getSchematicComponentTextInclusiveBounds(db, schematicComponent) {
+  if (!schematicComponent.center || !schematicComponent.size) return null;
+  const sourceComponent = schematicComponent.source_component_id ? db.source_component.get(schematicComponent.source_component_id) : void 0;
+  if (!sourceComponent || !TEXT_BOX_ENABLED_FTYPES.has(sourceComponent.ftype)) {
+    return null;
+  }
+  const textBounds = getSymbolTextBounds({
+    schematicComponent,
+    sourceComponent
+  });
+  if (textBounds.length === 0) return null;
+  const boxBounds = getSymbolBoxBounds(schematicComponent);
+  const bounds = { ...boxBounds };
+  for (const textBound of textBounds) {
+    bounds.minX = Math.min(bounds.minX, textBound.minX);
+    bounds.maxX = Math.max(bounds.maxX, textBound.maxX);
+    bounds.minY = Math.min(bounds.minY, textBound.minY);
+    bounds.maxY = Math.max(bounds.maxY, textBound.maxY);
+  }
+  if (bounds.minX === boxBounds.minX && bounds.maxX === boxBounds.maxX && bounds.minY === boxBounds.minY && bounds.maxY === boxBounds.maxY) {
+    return null;
+  }
+  return bounds;
+}
+function getSchematicComponentWithTextBounds(db, schematicComponent) {
+  const textBounds = getSchematicComponentTextInclusiveBounds(
+    db,
+    schematicComponent
+  );
+  if (!textBounds) return null;
+  const boxBounds = getSymbolBoxBounds(schematicComponent);
+  const isVertical = schematicComponent.size.height > schematicComponent.size.width;
+  if (isVertical) return textBounds;
+  const padX = Math.max(
+    boxBounds.minX - textBounds.minX,
+    textBounds.maxX - boxBounds.maxX
+  );
+  const padY = Math.max(
+    textBounds.maxY - boxBounds.maxY,
+    boxBounds.minY - textBounds.minY
+  );
+  return getBoundFromCenteredRect({
+    center: schematicComponent.center,
+    width: schematicComponent.size.width + 2 * padX,
+    height: schematicComponent.size.height + 2 * padY
+  });
+}
+
+// lib/components/primitive-components/Group/applySchematicMatchPackLayoutToTree.ts
+import { getBoundFromCenteredRect as getBoundFromCenteredRect2 } from "@tscircuit/math-utils";
 var debug6 = Debug8("Group_doInitialSchematicLayoutMatchpack");
 var DEFAULT_AVAILABLE_ROTATIONS = [0, 90, 180, 270];
 var ROTATION_TO_PLACE_SIDE_ON_TOP = {
@@ -18184,10 +18319,26 @@ function convertTreeToMatchPackInputProblem(tree, db, group) {
       if (component?.componentName === "Chip") {
         availableRotations = [0];
       }
-      const marginLeft = component?._parsedProps?.schMarginLeft ?? component?._parsedProps?.schMarginX ?? 0;
-      const marginRight = component?._parsedProps?.schMarginRight ?? component?._parsedProps?.schMarginX ?? 0;
-      let marginTop = component?._parsedProps?.schMarginTop ?? component?._parsedProps?.schMarginY ?? 0;
-      let marginBottom = component?._parsedProps?.schMarginBottom ?? component?._parsedProps?.schMarginY ?? 0;
+      const componentWithTextBounds = getSchematicComponentWithTextBounds(
+        db,
+        schematicComponent
+      );
+      let textPadLeft = 0;
+      let textPadRight = 0;
+      let textPadTop = 0;
+      let textPadBottom = 0;
+      if (componentWithTextBounds && schematicComponent.center) {
+        const halfWidth = (schematicComponent.size?.width ?? 0) / 2;
+        const halfHeight = (schematicComponent.size?.height ?? 0) / 2;
+        textPadLeft = schematicComponent.center.x - halfWidth - componentWithTextBounds.minX;
+        textPadRight = componentWithTextBounds.maxX - (schematicComponent.center.x + halfWidth);
+        textPadTop = componentWithTextBounds.maxY - (schematicComponent.center.y + halfHeight);
+        textPadBottom = schematicComponent.center.y - halfHeight - componentWithTextBounds.minY;
+      }
+      const marginLeft = (component?._parsedProps?.schMarginLeft ?? component?._parsedProps?.schMarginX ?? 0) + textPadLeft;
+      const marginRight = (component?._parsedProps?.schMarginRight ?? component?._parsedProps?.schMarginX ?? 0) + textPadRight;
+      let marginTop = (component?._parsedProps?.schMarginTop ?? component?._parsedProps?.schMarginY ?? 0) + textPadTop;
+      let marginBottom = (component?._parsedProps?.schMarginBottom ?? component?._parsedProps?.schMarginY ?? 0) + textPadBottom;
       if (component?.config.shouldRenderAsSchematicBox) {
         marginTop += 0.4;
         marginBottom += 0.4;
@@ -18257,12 +18408,15 @@ function convertTreeToMatchPackInputProblem(tree, db, group) {
         for (const comp of groupComponents) {
           if (comp.center && comp.size) {
             hasValidBounds = true;
-            const halfWidth = comp.size.width / 2;
-            const halfHeight = comp.size.height / 2;
-            minX = Math.min(minX, comp.center.x - halfWidth);
-            maxX = Math.max(maxX, comp.center.x + halfWidth);
-            minY = Math.min(minY, comp.center.y - halfHeight);
-            maxY = Math.max(maxY, comp.center.y + halfHeight);
+            const compBounds = getSchematicComponentWithTextBounds(db, comp) ?? getBoundFromCenteredRect2({
+              center: comp.center,
+              width: comp.size.width,
+              height: comp.size.height
+            });
+            minX = Math.min(minX, compBounds.minX);
+            maxX = Math.max(maxX, compBounds.maxX);
+            minY = Math.min(minY, compBounds.minY);
+            maxY = Math.max(maxY, compBounds.maxY);
           }
         }
         const marginLeft = groupInstance?._parsedProps?.schMarginLeft ?? groupInstance?._parsedProps?.schMarginX ?? 0;
@@ -19026,6 +19180,10 @@ import Debug12 from "debug";
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/createSchematicTraceSolverInputProblem.ts
 import "@tscircuit/schematic-trace-solver";
+import {
+  getBoundFromCenteredRect as getBoundFromCenteredRect3,
+  getBoundsCenter
+} from "@tscircuit/math-utils";
 var DEFAULT_MAX_MSP_PAIR_DISTANCE = 2.4;
 function createSchematicTraceSolverInputProblem(group) {
   const { db } = group.root;
@@ -19075,11 +19233,16 @@ function createSchematicTraceSolverInputProblem(group) {
     if (sourceComponent?.name) {
       sectionId = componentNameToSectionId.get(sourceComponent.name);
     }
-    chips.push({
-      chipId,
+    const layoutBounds = getSchematicComponentWithTextBounds(db, schematicComponent) ?? getBoundFromCenteredRect3({
       center: schematicComponent.center,
       width: schematicComponent.size.width,
-      height: schematicComponent.size.height,
+      height: schematicComponent.size.height
+    });
+    chips.push({
+      chipId,
+      center: getBoundsCenter(layoutBounds),
+      width: layoutBounds.maxX - layoutBounds.minX,
+      height: layoutBounds.maxY - layoutBounds.minY,
       pins,
       sectionId
     });
@@ -19590,6 +19753,45 @@ function computeJunctions(traces, opts = {}) {
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/applyTracesFromSolverOutput.ts
 import Debug10 from "debug";
 var debug8 = Debug10("Group_doInitialSchematicTraceRender");
+var MAX_PIN_SNAP_GAP = 1.5;
+function extendTraceEndpointsToReachPinsInsideExpandedBoundingBox(params, db) {
+  const { points, schematicPortIds, eligiblePortIds } = params;
+  const centers = schematicPortIds.filter((id) => eligiblePortIds.has(id)).map((id) => db.schematic_port.get(id)?.center).filter((c) => Boolean(c));
+  if (centers.length === 0) return points;
+  const result = points.map((p) => ({ x: p.x, y: p.y }));
+  const d2 = (a, b) => (a.x - b.x) ** 2 + (a.y - b.y) ** 2;
+  const usedCenters = /* @__PURE__ */ new Set();
+  const snap = (endpoint) => {
+    const pt = endpoint === "start" ? result[0] : result[result.length - 1];
+    let bestIndex = -1;
+    let bestDist = Number.POSITIVE_INFINITY;
+    for (let i = 0; i < centers.length; i++) {
+      if (usedCenters.has(i)) continue;
+      const dist = d2(centers[i], pt);
+      if (dist < bestDist) {
+        bestDist = dist;
+        bestIndex = i;
+      }
+    }
+    if (bestIndex < 0) return;
+    if (bestDist <= 1e-12) {
+      usedCenters.add(bestIndex);
+      return;
+    }
+    if (bestDist > MAX_PIN_SNAP_GAP ** 2) return;
+    const c = centers[bestIndex];
+    const ALIGN_EPS = 1e-3;
+    if (Math.abs(c.x - pt.x) > ALIGN_EPS && Math.abs(c.y - pt.y) > ALIGN_EPS) {
+      return;
+    }
+    usedCenters.add(bestIndex);
+    if (endpoint === "start") result.unshift({ x: c.x, y: c.y });
+    else result.push({ x: c.x, y: c.y });
+  };
+  snap("start");
+  snap("end");
+  return result;
+}
 function applyTracesFromSolverOutput(args) {
   const {
     group,
@@ -19599,6 +19801,17 @@ function applyTracesFromSolverOutput(args) {
     schematicPortIdsWithPreExistingNetLabels
   } = args;
   const { db } = group.root;
+  const eligiblePortIds = /* @__PURE__ */ new Set();
+  for (const schematicComponent of db.schematic_component.list()) {
+    if (!getSchematicComponentWithTextBounds(db, schematicComponent)) {
+      continue;
+    }
+    for (const port of db.schematic_port.list({
+      schematic_component_id: schematicComponent.schematic_component_id
+    })) {
+      eligiblePortIds.add(port.schematic_port_id);
+    }
+  }
   const traces = solver.netLabelTraceCollisionSolver?.getOutput().traces ?? solver.traceCleanupSolver?.getOutput().traces ?? solver.traceLabelOverlapAvoidanceSolver?.getOutput().traces ?? solver.schematicTraceLinesSolver?.solvedTracePaths;
   const pendingTraces = [];
   debug8(`Traces inside SchematicTraceSolver output: ${(traces ?? []).length}`);
@@ -19621,11 +19834,19 @@ function applyTracesFromSolverOutput(args) {
       );
       continue;
     }
+    const snappedPoints = extendTraceEndpointsToReachPinsInsideExpandedBoundingBox(
+      {
+        points,
+        schematicPortIds: solvedTraceSchematicPortIds,
+        eligiblePortIds
+      },
+      db
+    );
     const edges = [];
-    for (let i = 0; i < points.length - 1; i++) {
+    for (let i = 0; i < snappedPoints.length - 1; i++) {
       edges.push({
-        from: { x: points[i].x, y: points[i].y },
-        to: { x: points[i + 1].x, y: points[i + 1].y }
+        from: { x: snappedPoints[i].x, y: snappedPoints[i].y },
+        to: { x: snappedPoints[i + 1].x, y: snappedPoints[i + 1].y }
       });
     }
     const source_trace_id = String(solvedTracePath?.mspPairId);
@@ -22978,7 +23199,7 @@ function inflateSourcePort(sourcePort, inflatorContext) {
 
 // lib/components/normal-components/PushButton.ts
 import { pushButtonProps } from "@tscircuit/props";
-import { symbols as symbols3 } from "schematic-symbols";
+import { symbols as symbols4 } from "schematic-symbols";
 var PushButton = class extends NormalComponent3 {
   get config() {
     return {
@@ -22996,7 +23217,7 @@ var PushButton = class extends NormalComponent3 {
       pinCount: 2,
       ignoreSymbolPorts: true
     });
-    const symbol = symbols3[this._getSchematicSymbolNameOrThrow()];
+    const symbol = symbols4[this._getSchematicSymbolNameOrThrow()];
     const symPort1 = symbol.ports.find((p) => p.labels.includes("1"));
     const symPort2 = symbol.ports.find((p) => p.labels.includes("2"));
     const ports = this.selectAll("port");
@@ -23785,7 +24006,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1334",
+  version: "0.0.1335",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -23836,8 +24057,8 @@ var package_default = {
     "@tscircuit/props": "^0.0.549",
     "@tscircuit/ngspice-spice-engine": "^0.0.16",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
-    "@tscircuit/schematic-trace-solver": "^0.0.69",
     "@tscircuit/solver-utils": "^0.0.16",
+    "@tscircuit/schematic-trace-solver": "^0.0.70",
     "@tscircuit/soup-util": "^0.0.41",
     "@types/bun": "^1.2.16",
     "@types/debug": "^4.1.12",
@@ -26844,7 +27065,7 @@ import { distance as distance17 } from "@tscircuit/math-utils";
 // node_modules/@tscircuit/breakout-point-solver/lib/pad/breakout-pad-collisions.ts
 import {
   doesSegmentIntersectRect,
-  getBoundFromCenteredRect
+  getBoundFromCenteredRect as getBoundFromCenteredRect4
 } from "@tscircuit/math-utils";
 var degreesToRadians = (degrees) => degrees * Math.PI / 180;
 var rotatePoint = (point6, radians) => {
@@ -26867,7 +27088,7 @@ var getLocalPadPoint = (point6, pad) => {
 };
 var getInflatedPadRect = (pad) => {
   const clearance = pad.clearance ?? 0;
-  return getBoundFromCenteredRect({
+  return getBoundFromCenteredRect4({
     center: { x: 0, y: 0 },
     width: pad.width + clearance * 2,
     height: pad.height + clearance * 2
@@ -28766,7 +28987,7 @@ var convertCircuitJsonToUsbCStandardCircuitJson = (partCircuitJson) => {
 };
 
 // lib/components/normal-components/Connector.ts
-import { symbols as symbols4 } from "schematic-symbols";
+import { symbols as symbols5 } from "schematic-symbols";
 
 // lib/components/normal-components/Connector_insertInnerSymbolInSchematicBox.ts
 var INNER_SYMBOL_SCALE_FACTOR = 0.5;
@@ -29148,7 +29369,7 @@ var Connector = class extends Chip {
   doInitialSchematicComponentRender() {
     super.doInitialSchematicComponentRender();
     if (!this.root?.schematicDisabled && this.schematic_component_id && this._getConnectorProps().standard === "usb_c") {
-      const usbcSymbol = symbols4.usbc;
+      const usbcSymbol = symbols5.usbc;
       if (usbcSymbol) {
         insertInnerSymbolInSchematicBox(this, usbcSymbol);
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1335",
+  "version": "0.0.1336",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -52,8 +52,8 @@
     "@tscircuit/props": "^0.0.549",
     "@tscircuit/ngspice-spice-engine": "^0.0.16",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
-    "@tscircuit/schematic-trace-solver": "^0.0.69",
     "@tscircuit/solver-utils": "^0.0.16",
+    "@tscircuit/schematic-trace-solver": "^0.0.70",
     "@tscircuit/soup-util": "^0.0.41",
     "@types/bun": "^1.2.16",
     "@types/debug": "^4.1.12",