@tscircuit/core 0.0.653 → 0.0.655

package/dist/index.js

@@ -7211,7 +7211,7 @@ var CapacityMeshAutorouter = class {
 
 // lib/components/primitive-components/Group/Group.ts
 import "circuit-json";
-import Debug9 from "debug";
+import Debug10 from "debug";
 import "zod";
 
 // lib/components/primitive-components/TraceHint.ts
@@ -9489,7 +9489,7 @@ import { convertSrjToGraphicsObject } from "@tscircuit/capacity-autorouter";
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/Group_doInitialSchematicTraceRender.ts
 import { SchematicTracePipelineSolver as SchematicTracePipelineSolver4 } from "@tscircuit/schematic-trace-solver";
-import Debug8 from "debug";
+import Debug9 from "debug";
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/createSchematicTraceSolverInputProblem.ts
 import "@tscircuit/schematic-trace-solver";
@@ -9568,7 +9568,6 @@ function createSchematicTraceSolverInputProblem(group) {
   const directConnections = [];
   const pairKeyToSourceTraceId = /* @__PURE__ */ new Map();
   for (const st of db.source_trace.list()) {
-    if (displayLabelSourceTraceIds.has(st.source_trace_id)) continue;
     if (st.subcircuit_id && !allowedSubcircuitIds.has(st.subcircuit_id)) {
       continue;
     }
@@ -9633,7 +9632,7 @@ function createSchematicTraceSolverInputProblem(group) {
     )) {
       if (!net.name) continue;
       if (!presentNetIds.has(net.name)) continue;
-      if (net.name === "GND") {
+      if (net.is_ground || net.name.startsWith("GND")) {
         netToAllowedOrientations[net.name] = ["y-"];
       } else if (/^V/.test(net.name)) {
         netToAllowedOrientations[net.name] = ["y+"];
@@ -10056,11 +10055,22 @@ var oppositeSide = (input) => {
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getNetNameFromPorts.ts
 var getNetNameFromPorts = (ports) => {
+  for (const port of ports) {
+    const traces = port._getDirectlyConnectedTraces();
+    for (const trace of traces) {
+      const displayLabel = trace._parsedProps.schDisplayLabel;
+      if (displayLabel) {
+        return { name: displayLabel, wasAssignedDisplayLabel: true };
+      }
+    }
+  }
   const netName = ports.map((p) => p._getNetLabelText()).join("/");
-  return netName;
+  return { name: netName, wasAssignedDisplayLabel: false };
 };
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/applyNetLabelPlacements.ts
+import Debug8 from "debug";
+var debug7 = Debug8("Group_doInitialSchematicTraceRender");
 function applyNetLabelPlacements(args) {
   const {
     group,
@@ -10078,6 +10088,7 @@ function applyNetLabelPlacements(args) {
   const netLabelPlacements = solver.netLabelPlacementSolver?.netLabelPlacements ?? [];
   const globalConnMap = solver.mspConnectionPairSolver.globalConnMap;
   for (const placement of netLabelPlacements) {
+    debug7(`processing placement: ${placement.netId}`);
     const placementUserNetId = globalConnMap.getIdsConnectedToNet(placement.globalConnNetId).find((id) => userNetIdToSck.get(id));
     const placementSck = userNetIdToSck.get(placementUserNetId);
     const anchor_position = placement.anchorPoint;
@@ -10090,6 +10101,9 @@ function applyNetLabelPlacements(args) {
     if (schPortIds.some(
       (schPortId) => schematicPortIdsWithPreExistingNetLabels.has(schPortId)
     )) {
+      debug7(
+        `skipping net label placement for "${placement.netId}" REASON:schematic port has pre-existing net label`
+      );
       continue;
     }
     if (sourceNet) {
@@ -10106,15 +10120,18 @@ function applyNetLabelPlacements(args) {
         anchor_side,
         ...sourceNet?.source_net_id ? { source_net_id: sourceNet.source_net_id } : {}
       });
-      return;
+      continue;
     }
-    if (schPortIds.some(
+    const ports = group.selectAll("port").filter((p) => p._getSubcircuitConnectivityKey() === placementSck);
+    const { name: text, wasAssignedDisplayLabel } = getNetNameFromPorts(ports);
+    if (!wasAssignedDisplayLabel && schPortIds.some(
       (schPortId) => schematicPortIdsWithRoutedTraces.has(schPortId)
     )) {
+      debug7(
+        `skipping net label placement for "${placement.netId}" REASON:schematic port has routed traces and no display label`
+      );
       continue;
     }
-    const ports = group.selectAll("port").filter((p) => p._getSubcircuitConnectivityKey() === placementSck);
-    const text = getNetNameFromPorts(ports);
     const center = computeSchematicNetLabelCenter({
       anchor_position,
       anchor_side,
@@ -10216,7 +10233,7 @@ var getSchematicPortIdsWithRoutedTraces = ({
 };
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/Group_doInitialSchematicTraceRender.ts
-var debug7 = Debug8("Group_doInitialSchematicTraceRender");
+var debug8 = Debug9("Group_doInitialSchematicTraceRender");
 var Group_doInitialSchematicTraceRender = (group) => {
   if (!group.root?._featureMspSchematicTraceRouting) return;
   if (!group.isSubcircuit) return;
@@ -10233,7 +10250,7 @@ var Group_doInitialSchematicTraceRender = (group) => {
     userNetIdToSck
   } = createSchematicTraceSolverInputProblem(group);
   const schematicPortIdsWithPreExistingNetLabels = getSchematicPortIdsWithAssignedNetLabels(group);
-  if (debug7.enabled) {
+  if (debug8.enabled) {
     globalThis.debugOutputs?.add(
       "group-trace-render-input-problem",
       JSON.stringify(inputProblem, null, 2)
@@ -10438,20 +10455,20 @@ var Group6 = class extends NormalComponent {
     return false;
   }
   _hasTracesToRoute() {
-    const debug8 = Debug9("tscircuit:core:_hasTracesToRoute");
+    const debug9 = Debug10("tscircuit:core:_hasTracesToRoute");
     const traces = this.selectAll("trace");
-    debug8(`[${this.getString()}] has ${traces.length} traces to route`);
+    debug9(`[${this.getString()}] has ${traces.length} traces to route`);
     return traces.length > 0;
   }
   async _runEffectMakeHttpAutoroutingRequest() {
     const { db } = this.root;
-    const debug8 = Debug9("tscircuit:core:_runEffectMakeHttpAutoroutingRequest");
+    const debug9 = Debug10("tscircuit:core:_runEffectMakeHttpAutoroutingRequest");
     const props = this._parsedProps;
     const autorouterConfig = this._getAutorouterConfig();
     const serverUrl = autorouterConfig.serverUrl;
     const serverMode = autorouterConfig.serverMode;
     const fetchWithDebug = (url, options) => {
-      debug8("fetching", url);
+      debug9("fetching", url);
       if (options.headers) {
         options.headers["Tscircuit-Core-Version"] = this.root?.getCoreVersion();
       }
@@ -10567,15 +10584,15 @@ var Group6 = class extends NormalComponent {
   async _runLocalAutorouting() {
     const { db } = this.root;
     const props = this._parsedProps;
-    const debug8 = Debug9("tscircuit:core:_runLocalAutorouting");
-    debug8(`[${this.getString()}] starting local autorouting`);
+    const debug9 = Debug10("tscircuit:core:_runLocalAutorouting");
+    debug9(`[${this.getString()}] starting local autorouting`);
     const autorouterConfig = this._getAutorouterConfig();
     const { simpleRouteJson } = getSimpleRouteJsonFromCircuitJson({
       db,
       minTraceWidth: this.props.autorouter?.minTraceWidth ?? 0.15,
       subcircuit_id: this.subcircuit_id
     });
-    if (debug8.enabled) {
+    if (debug9.enabled) {
       const graphicsObject = convertSrjToGraphicsObject(
         simpleRouteJson
       );
@@ -10600,11 +10617,11 @@ var Group6 = class extends NormalComponent {
     const routingPromise = new Promise(
       (resolve, reject) => {
         autorouter.on("complete", (event) => {
-          debug8(`[${this.getString()}] local autorouting complete`);
+          debug9(`[${this.getString()}] local autorouting complete`);
           resolve(event.traces);
         });
         autorouter.on("error", (event) => {
-          debug8(
+          debug9(
             `[${this.getString()}] local autorouting error: ${event.error.message}`
           );
           reject(event.error);
@@ -10661,18 +10678,18 @@ var Group6 = class extends NormalComponent {
     }
   }
   doInitialPcbTraceRender() {
-    const debug8 = Debug9("tscircuit:core:doInitialPcbTraceRender");
+    const debug9 = Debug10("tscircuit:core:doInitialPcbTraceRender");
     if (!this.isSubcircuit) return;
     if (this.root?.pcbDisabled) return;
     if (this.getInheritedProperty("routingDisabled")) return;
     if (this._shouldUseTraceByTraceRouting()) return;
     if (!this._areChildSubcircuitsRouted()) {
-      debug8(
+      debug9(
         `[${this.getString()}] child subcircuits are not routed, skipping async autorouting until subcircuits routed`
       );
       return;
     }
-    debug8(
+    debug9(
       `[${this.getString()}] no child subcircuits to wait for, initiating async routing`
     );
     if (!this._hasTracesToRoute()) return;
@@ -10682,12 +10699,12 @@ var Group6 = class extends NormalComponent {
     Group_doInitialSchematicTraceRender(this);
   }
   updatePcbTraceRender() {
-    const debug8 = Debug9("tscircuit:core:updatePcbTraceRender");
-    debug8(`[${this.getString()}] updating...`);
+    const debug9 = Debug10("tscircuit:core:updatePcbTraceRender");
+    debug9(`[${this.getString()}] updating...`);
     if (!this.isSubcircuit) return;
     if (this._shouldRouteAsync() && this._hasTracesToRoute() && !this._hasStartedAsyncAutorouting) {
       if (this._areChildSubcircuitsRouted()) {
-        debug8(
+        debug9(
           `[${this.getString()}] child subcircuits are now routed, starting async autorouting`
         );
         this._startAsyncAutorouting();
@@ -10698,14 +10715,14 @@ var Group6 = class extends NormalComponent {
     if (this._shouldUseTraceByTraceRouting()) return;
     const { db } = this.root;
     if (this._asyncAutoroutingResult.output_simple_route_json) {
-      debug8(
+      debug9(
         `[${this.getString()}] updating PCB traces from simple route json (${this._asyncAutoroutingResult.output_simple_route_json.traces?.length} traces)`
       );
       this._updatePcbTraceRenderFromSimpleRouteJson();
       return;
     }
     if (this._asyncAutoroutingResult.output_pcb_traces) {
-      debug8(
+      debug9(
         `[${this.getString()}] updating PCB traces from ${this._asyncAutoroutingResult.output_pcb_traces.length} traces`
       );
       this._updatePcbTraceRenderFromPcbTraces();
@@ -13712,7 +13729,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.652",
+  version: "0.0.654",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -13754,7 +13771,7 @@ var package_default = {
     "@tscircuit/props": "^0.0.287",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
-    "@tscircuit/schematic-trace-solver": "^0.0.17",
+    "@tscircuit/schematic-trace-solver": "^0.0.22",
     "@tscircuit/simple-3d-svg": "^0.0.38",
     "@types/bun": "^1.2.16",
     "@types/debug": "^4.1.12",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.653",
+  "version": "0.0.655",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -43,7 +43,7 @@
     "@tscircuit/props": "^0.0.287",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
-    "@tscircuit/schematic-trace-solver": "^0.0.17",
+    "@tscircuit/schematic-trace-solver": "^0.0.22",
     "@tscircuit/simple-3d-svg": "^0.0.38",
     "@types/bun": "^1.2.16",
     "@types/debug": "^4.1.12",