@tscircuit/core 0.0.1373 → 0.0.1375

package/dist/index.d.ts

@@ -79128,6 +79128,7 @@ declare class Keepout extends PrimitiveComponent<typeof pcbKeepoutProps> {
 
 declare class NetLabel extends PrimitiveComponent<typeof netLabelProps> {
     source_net_label_id?: string;
+    schematic_net_label_id?: string;
     get config(): {
         componentName: string;
         zodProps: zod.ZodObject<{

package/dist/index.js

@@ -3226,11 +3226,11 @@ var getOtherSchematicTraces = ({
     const otherSourceTrace = db.source_trace.get(
       otherSchematicTrace.source_trace_id
     );
-    const isSameNet = otherSourceTrace?.subcircuit_connectivity_map_key === mySourceTrace.subcircuit_connectivity_map_key;
-    if (differentNetOnly && isSameNet) {
+    const isSameNet2 = otherSourceTrace?.subcircuit_connectivity_map_key === mySourceTrace.subcircuit_connectivity_map_key;
+    if (differentNetOnly && isSameNet2) {
       continue;
     }
-    if (sameNetOnly && !isSameNet) {
+    if (sameNetOnly && !isSameNet2) {
       continue;
     }
     traces.push(otherSchematicTrace);
@@ -19957,8 +19957,8 @@ function computeJunctions(traces, opts = {}) {
     for (let j = i + 1; j < traces.length; j++) {
       const B = traces[j];
       const BEnds = endpointsByTrace[j];
-      const isSameNet = A.connectivity_key !== void 0 && A.connectivity_key === B.connectivity_key;
-      if (isSameNet) {
+      const isSameNet2 = A.connectivity_key !== void 0 && A.connectivity_key === B.connectivity_key;
+      if (isSameNet2) {
         for (const eA of A.edges) {
           for (const eB of B.edges) {
             const p = segmentIntersection(eA.from, eA.to, eB.from, eB.to, tol);
@@ -20374,9 +20374,43 @@ var getNetNameFromPorts = (ports) => {
   return { name: netName, wasAssignedDisplayLabel: false };
 };
 
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getNetLabelTextBounds.ts
+var NET_LABEL_TEXT_HEIGHT = 0.18;
+var getNetLabelTextBounds = ({
+  center,
+  text
+}) => {
+  const width = getSchematicNetLabelTextWidth({ text });
+  const halfWidth = width / 2;
+  const halfHeight = NET_LABEL_TEXT_HEIGHT / 2;
+  return {
+    minX: center.x - halfWidth,
+    maxX: center.x + halfWidth,
+    minY: center.y - halfHeight,
+    maxY: center.y + halfHeight
+  };
+};
+
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/applyNetLabelPlacements.ts
 import Debug11 from "debug";
+import { doBoundsOverlap as doBoundsOverlap2 } from "@tscircuit/math-utils";
 var debug9 = Debug11("Group_doInitialSchematicTraceRender");
+var isSameNet = (label, sourceNet) => label.source_net_id != null && label.source_net_id === sourceNet.source_net_id;
+var isUserDefinedNetLabelRedundantWithPlacement = (label, solverPlacement) => {
+  if (!isSameNet(label, solverPlacement.sourceNet)) {
+    return false;
+  }
+  if (label.schematicPortIds.some(
+    (id) => solverPlacement.schematicPortIds.has(id)
+  )) {
+    return true;
+  }
+  if (!label.center) return false;
+  return doBoundsOverlap2(
+    getNetLabelTextBounds({ center: label.center, text: label.text }),
+    solverPlacement.bounds
+  );
+};
 function applyNetLabelPlacements(args) {
   const {
     group,
@@ -20423,6 +20457,15 @@ function applyNetLabelPlacements(args) {
     }
   }
   const globalConnMap = solver.mspConnectionPairSolver.globalConnMap;
+  const userDefinedNetLabels = group.selectAll("netlabel").map((label) => {
+    if (!label.schematic_net_label_id) return null;
+    const dbLabel = db.schematic_net_label.get(label.schematic_net_label_id);
+    if (!dbLabel) return null;
+    return {
+      ...dbLabel,
+      schematicPortIds: label._getConnectedPorts().map((port) => port.schematic_port_id).filter((id) => Boolean(id))
+    };
+  }).filter((label) => label !== null);
   for (const placement of dedupedNetLabelPlacements) {
     debug9(`processing placement: ${placement.netId}`);
     const placementUserNetId = globalConnMap.getIdsConnectedToNet(placement.globalConnNetId).find((id) => userNetIdToConnKey.get(id));
@@ -20467,6 +20510,19 @@ function applyNetLabelPlacements(args) {
         anchor_side,
         text: text2
       });
+      if (!isPowerOrGroundNet) {
+        const solverPlacement = {
+          sourceNet,
+          text: text2,
+          schematicPortIds: new Set(schPortIds),
+          bounds: getNetLabelTextBounds({ center: center2, text: text2 })
+        };
+        if (userDefinedNetLabels.some(
+          (label) => isUserDefinedNetLabelRedundantWithPlacement(label, solverPlacement)
+        )) {
+          continue;
+        }
+      }
       const netLabel2 = {
         text: text2,
         source_net_id: sourceNet.source_net_id,
@@ -24687,7 +24743,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1372",
+  version: "0.0.1374",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -24722,7 +24778,7 @@ var package_default = {
     "@tscircuit/breakout-point-solver": "github:tscircuit/breakout-point-solver#bac9629",
     "@tscircuit/capacity-autorouter": "^0.0.583",
     "@tscircuit/checks": "0.0.140",
-    "@tscircuit/circuit-json-util": "^0.0.96",
+    "@tscircuit/circuit-json-util": "^0.0.97",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "0.0.35",
     "@tscircuit/footprinter": "^0.0.357",
@@ -29051,6 +29107,7 @@ import {
 import { calculateElbow as calculateElbow2 } from "calculate-elbow";
 var NetLabel = class extends PrimitiveComponent2 {
   source_net_label_id;
+  schematic_net_label_id;
   get config() {
     return {
       componentName: "NetLabel",
@@ -29141,6 +29198,7 @@ var NetLabel = class extends PrimitiveComponent2 {
       schematic_sheet_id: this._resolveSchematicSheetId()
     });
     this.source_net_label_id = netLabel.source_net_id;
+    this.schematic_net_label_id = netLabel.schematic_net_label_id;
   }
   _resolveConnectsTo() {
     const { _parsedProps: props } = this;
@@ -31488,7 +31546,7 @@ var AnalogSimulation = class extends PrimitiveComponent2 {
 import { voltageProbeProps } from "@tscircuit/props";
 
 // lib/utils/schematic/selectBestLabelAlignment.ts
-import { doBoundsOverlap as doBoundsOverlap2 } from "@tscircuit/math-utils";
+import { doBoundsOverlap as doBoundsOverlap3 } from "@tscircuit/math-utils";
 function getLabelBounds(probePosition, labelText, alignment, labelOffset = 0.3) {
   const charWidth = 0.1;
   const labelWidth = Math.max(labelText.length * charWidth, 0.3);
@@ -31559,7 +31617,7 @@ function getElementBounds(elm) {
   return null;
 }
 function getOverlapArea(a, b) {
-  if (!doBoundsOverlap2(a, b)) return 0;
+  if (!doBoundsOverlap3(a, b)) return 0;
   const overlapWidth = Math.min(a.maxX, b.maxX) - Math.max(a.minX, b.minX);
   const overlapHeight = Math.min(a.maxY, b.maxY) - Math.max(a.minY, b.minY);
   return overlapWidth * overlapHeight;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1373",
+  "version": "0.0.1375",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -36,7 +36,7 @@
     "@tscircuit/breakout-point-solver": "github:tscircuit/breakout-point-solver#bac9629",
     "@tscircuit/capacity-autorouter": "^0.0.583",
     "@tscircuit/checks": "0.0.140",
-    "@tscircuit/circuit-json-util": "^0.0.96",
+    "@tscircuit/circuit-json-util": "^0.0.97",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "0.0.35",
     "@tscircuit/footprinter": "^0.0.357",