@tscircuit/core 0.0.1293 → 0.0.1295

package/dist/index.d.ts

@@ -230,6 +230,7 @@ interface DebugLogOutputEvent {
 interface IIsolatedCircuit {
     emit(event: RootCircuitEventName, ...args: any[]): void;
     on(event: RootCircuitEventName, listener: (...args: any[]) => void): void;
+    isDoneRendering(): boolean;
     _hasIncompleteAsyncEffectsForPhase(phase: RenderPhase): boolean;
 }
 
@@ -387,6 +388,7 @@ declare class IsolatedCircuit {
     _hasRenderedAtleastOnce: boolean;
     private _asyncEffectIdsByPhase;
     private _asyncEffectPhaseById;
+    private _hasUnrenderedUpdatesFromAsyncEffects;
     private _runningAsyncEffectsById;
     constructor({ platform, projectUrl, cachedSubcircuits, pendingSubcircuitRenders, }?: {
         platform?: PlatformConfig;
@@ -403,6 +405,7 @@ declare class IsolatedCircuit {
     _guessRootComponent(): void;
     render(): void;
     renderUntilSettled(): Promise<void>;
+    isDoneRendering(): boolean;
     _hasIncompleteAsyncEffects(): boolean;
     _hasIncompleteAsyncEffectsForPhase(phase: RenderPhase): boolean;
     getRunningAsyncEffects(): Array<{

package/dist/index.js

@@ -18444,15 +18444,40 @@ function applyNetLabelPlacements(args) {
   } = args;
   const { db } = group.root;
   const netLabelPlacements = solver.netLabelTraceCollisionSolver?.getOutput().netLabelPlacements ?? solver.netLabelPlacementSolver?.netLabelPlacements ?? solver.traceLabelOverlapAvoidanceSolver?.getOutput().netLabelPlacements ?? [];
-  const netLabelPlacementCountByGlobalNetId = /* @__PURE__ */ new Map();
+  const dedupedNetLabelPlacements = [];
+  const netLabelPlacementKeys = /* @__PURE__ */ new Set();
   for (const placement of netLabelPlacements) {
+    const pinIds = [...placement.pinIds ?? []].sort();
+    const key = `${placement.globalConnNetId}|${pinIds.join("::")}|${placement.netId ?? ""}`;
+    if (netLabelPlacementKeys.has(key)) {
+      debug9(
+        `skipping duplicate placement for "${placement.netId}" REASON:identical net label placement`
+      );
+      continue;
+    }
+    netLabelPlacementKeys.add(key);
+    dedupedNetLabelPlacements.push(placement);
+  }
+  const netLabelPlacementCountByGlobalNetId = /* @__PURE__ */ new Map();
+  const routedPairKeysByGlobalNetId = /* @__PURE__ */ new Map();
+  const globalNetIdsWithPortOnlyPlacements = /* @__PURE__ */ new Set();
+  for (const placement of dedupedNetLabelPlacements) {
     netLabelPlacementCountByGlobalNetId.set(
       placement.globalConnNetId,
       (netLabelPlacementCountByGlobalNetId.get(placement.globalConnNetId) ?? 0) + 1
     );
+    if ((placement.pinIds?.length ?? 0) > 1) {
+      if (!routedPairKeysByGlobalNetId.has(placement.globalConnNetId)) {
+        routedPairKeysByGlobalNetId.set(placement.globalConnNetId, /* @__PURE__ */ new Set());
+      }
+      routedPairKeysByGlobalNetId.get(placement.globalConnNetId).add(placement.pinIds.slice().sort().join("::"));
+    }
+    if ((placement.pinIds?.length ?? 0) <= 1) {
+      globalNetIdsWithPortOnlyPlacements.add(placement.globalConnNetId);
+    }
   }
   const globalConnMap = solver.mspConnectionPairSolver.globalConnMap;
-  for (const placement of netLabelPlacements) {
+  for (const placement of dedupedNetLabelPlacements) {
     debug9(`processing placement: ${placement.netId}`);
     const placementUserNetId = globalConnMap.getIdsConnectedToNet(placement.globalConnNetId).find((id) => userNetIdToConnKey.get(id));
     const placementConnKey = userNetIdToConnKey.get(placementUserNetId);
@@ -18508,7 +18533,9 @@ function applyNetLabelPlacements(args) {
     }
     const ports = group.selectAll("port").filter((p) => p._getSubcircuitConnectivityKey() === placementConnKey);
     const { name: text, wasAssignedDisplayLabel } = getNetNameFromPorts(ports);
-    if (!wasAssignedDisplayLabel && (netLabelPlacementCountByGlobalNetId.get(placement.globalConnNetId) ?? 0) <= 1 && schPortIds.some(
+    const isRoutedPairPlacement = (placement.pinIds?.length ?? 0) > 1;
+    const shouldKeepRoutedPairLabel = isRoutedPairPlacement && (globalNetIdsWithPortOnlyPlacements.has(placement.globalConnNetId) || (routedPairKeysByGlobalNetId.get(placement.globalConnNetId)?.size ?? 0) > 1);
+    if (!wasAssignedDisplayLabel && !shouldKeepRoutedPairLabel && schPortIds.some(
       (schPortId) => schematicPortIdsWithRoutedTraces.has(schPortId)
     )) {
       debug9(
@@ -18535,6 +18562,26 @@ function applyNetLabelPlacements(args) {
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/insertNetLabelsForPortsMissingTrace.ts
 var NEAR_EXISTING_NET_LABEL_DISTANCE = 0.5;
 var SAME_ANCHOR_POSITION_DISTANCE = 0.1;
+var doesSchematicNetLabelRepresentCurrentSourceConnection = (args) => {
+  const { nl, connKey, sourceNet, text } = args;
+  if (sourceNet?.source_net_id && nl.source_net_id) {
+    return nl.source_net_id === sourceNet.source_net_id;
+  }
+  if (nl.source_net_id) {
+    return nl.source_net_id === connKey;
+  }
+  return nl.text === text;
+};
+var getSourcePortNetLabelText = (db, sourcePortId) => {
+  const sourcePort = db.source_port.get(sourcePortId);
+  if (!sourcePort) return void 0;
+  let sourceComponent;
+  if (sourcePort.source_component_id) {
+    sourceComponent = db.source_component.get(sourcePort.source_component_id);
+  }
+  if (!sourceComponent?.name || !sourcePort.name) return void 0;
+  return `${sourceComponent.name}_${sourcePort.name}`;
+};
 var insertNetLabelsForPortsMissingTrace = ({
   allSourceAndSchematicPortIdsInScope,
   group,
@@ -18554,10 +18601,14 @@ var insertNetLabelsForPortsMissingTrace = ({
     const connKey = sourcePort?.subcircuit_connectivity_map_key;
     if (!connKey) continue;
     const sourceNet = connKeyToSourceNet.get(connKey);
-    if (!sourceNet) {
-      continue;
-    }
-    const text = sourceNet.name || sourceNet.source_net_id || connKey;
+    const connectedSourcePortIdsForKey = Array.from(
+      allSourceAndSchematicPortIdsInScope
+    ).map((portId) => schPortIdToSourcePortId.get(portId)).filter((sourcePortId) => {
+      if (!sourcePortId) return false;
+      return db.source_port.get(sourcePortId)?.subcircuit_connectivity_map_key === connKey;
+    });
+    const implicitPortLabelText = connectedSourcePortIdsForKey.map((sourcePortId) => getSourcePortNetLabelText(db, sourcePortId)).filter((label) => Boolean(label)).join("/");
+    const text = sourceNet?.name || sourceNet?.source_net_id || implicitPortLabelText || connKey;
     const connectedPortCountForKey = Array.from(
       allSourceAndSchematicPortIdsInScope
     ).filter((portId) => {
@@ -18565,13 +18616,12 @@ var insertNetLabelsForPortsMissingTrace = ({
       if (!sourcePortId) return false;
       return db.source_port.get(sourcePortId)?.subcircuit_connectivity_map_key === connKey;
     }).length;
-    const isGndNet = sourceNet.is_ground;
-    const isPowerNet = !isGndNet && sourceNet.is_power;
-    const usePowerSymbolSide = connectedPortCountForKey > 1;
+    const isGndNet = sourceNet?.is_ground ?? false;
+    const isPowerNet = !isGndNet && (sourceNet?.is_power ?? false);
     let side;
-    if (usePowerSymbolSide && isGndNet) {
+    if (isGndNet) {
       side = "top";
-    } else if (usePowerSymbolSide && isPowerNet) {
+    } else if (isPowerNet) {
       side = "bottom";
     } else {
       side = getEnteringEdgeFromDirection(
@@ -18583,32 +18633,40 @@ var insertNetLabelsForPortsMissingTrace = ({
       anchor_side: side,
       text
     });
-    const sameNetLabel = db.schematic_net_label.list().find((nl) => {
-      if (sourceNet.source_net_id && nl.source_net_id) {
-        return nl.source_net_id === sourceNet.source_net_id;
-      }
-      return nl.text === (sourceNet.name || connKey);
-    });
-    if (sameNetLabel && connectedPortCountForKey <= 1) {
-      db.schematic_net_label.update(sameNetLabel.schematic_net_label_id, {
-        text,
-        anchor_position: schPort.center,
-        center,
-        anchor_side: side
+    const existingNetLabelForCurrentSourceConnection = db.schematic_net_label.list().find((nl) => {
+      return doesSchematicNetLabelRepresentCurrentSourceConnection({
+        nl,
+        connKey,
+        sourceNet,
+        text
       });
-      continue;
-    }
-    if (sameNetLabel) {
-      const dx = sameNetLabel.anchor_position.x - schPort.center.x;
-      const dy = sameNetLabel.anchor_position.y - schPort.center.y;
-      const labelIsNearPort = dx * dx + dy * dy < NEAR_EXISTING_NET_LABEL_DISTANCE * NEAR_EXISTING_NET_LABEL_DISTANCE;
-      if (labelIsNearPort && sourceNet.is_ground) {
-        db.schematic_net_label.update(sameNetLabel.schematic_net_label_id, {
+    });
+    if (existingNetLabelForCurrentSourceConnection && connectedPortCountForKey <= 1) {
+      db.schematic_net_label.update(
+        existingNetLabelForCurrentSourceConnection.schematic_net_label_id,
+        {
           text,
           anchor_position: schPort.center,
           center,
           anchor_side: side
-        });
+        }
+      );
+      continue;
+    }
+    if (existingNetLabelForCurrentSourceConnection) {
+      const dx = existingNetLabelForCurrentSourceConnection.anchor_position.x - schPort.center.x;
+      const dy = existingNetLabelForCurrentSourceConnection.anchor_position.y - schPort.center.y;
+      const labelIsNearPort = dx * dx + dy * dy < NEAR_EXISTING_NET_LABEL_DISTANCE * NEAR_EXISTING_NET_LABEL_DISTANCE;
+      if (labelIsNearPort && isGndNet) {
+        db.schematic_net_label.update(
+          existingNetLabelForCurrentSourceConnection.schematic_net_label_id,
+          {
+            text,
+            anchor_position: schPort.center,
+            center,
+            anchor_side: side
+          }
+        );
         continue;
       }
       const existingAtPort = db.schematic_net_label.list().some((nl) => {
@@ -18617,16 +18675,41 @@ var insertNetLabelsForPortsMissingTrace = ({
         if (dx2 * dx2 + dy2 * dy2 >= SAME_ANCHOR_POSITION_DISTANCE * SAME_ANCHOR_POSITION_DISTANCE) {
           return false;
         }
-        if (sourceNet.source_net_id && nl.source_net_id) {
-          return nl.source_net_id === sourceNet.source_net_id;
-        }
-        return nl.text === (sourceNet.name || connKey);
+        return doesSchematicNetLabelRepresentCurrentSourceConnection({
+          nl,
+          connKey,
+          sourceNet,
+          text
+        });
       });
       if (existingAtPort) continue;
     }
+    if (!sourceNet) {
+      for (const nl of db.schematic_net_label.list()) {
+        if (nl.source_net_id !== connKey) continue;
+        const isAttachedToConnectedPort = connectedSourcePortIdsForKey.some(
+          (sourcePortId) => {
+            const schPortId = Array.from(
+              schPortIdToSourcePortId.entries()
+            ).find(([, id]) => id === sourcePortId)?.[0];
+            let connectedSchPort;
+            if (schPortId) {
+              connectedSchPort = db.schematic_port.get(schPortId);
+            }
+            if (!connectedSchPort?.center || !nl.anchor_position) return false;
+            const dx = nl.anchor_position.x - connectedSchPort.center.x;
+            const dy = nl.anchor_position.y - connectedSchPort.center.y;
+            return dx * dx + dy * dy < SAME_ANCHOR_POSITION_DISTANCE * SAME_ANCHOR_POSITION_DISTANCE;
+          }
+        );
+        if (!isAttachedToConnectedPort) {
+          db.schematic_net_label.delete(nl.schematic_net_label_id);
+        }
+      }
+    }
     const netLabel = {
       text,
-      source_net_id: sourceNet.source_net_id,
+      source_net_id: sourceNet?.source_net_id ?? connKey,
       anchor_position: schPort.center,
       center,
       anchor_side: side
@@ -22265,7 +22348,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1292",
+  version: "0.0.1294",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -22441,6 +22524,7 @@ var IsolatedCircuit = class {
   _hasRenderedAtleastOnce = false;
   _asyncEffectIdsByPhase = /* @__PURE__ */ new Map();
   _asyncEffectPhaseById = /* @__PURE__ */ new Map();
+  _hasUnrenderedUpdatesFromAsyncEffects = false;
   _runningAsyncEffectsById = /* @__PURE__ */ new Map();
   constructor({
     platform,
@@ -22527,6 +22611,7 @@ var IsolatedCircuit = class {
     if (!firstChild) throw new Error("IsolatedCircuit has no root component");
     firstChild.parent = this;
     firstChild.runRenderCycle();
+    this._hasUnrenderedUpdatesFromAsyncEffects = false;
     this._hasRenderedAtleastOnce = true;
   }
   async renderUntilSettled() {
@@ -22538,14 +22623,18 @@ var IsolatedCircuit = class {
       });
     }
     this.render();
-    while (this._hasIncompleteAsyncEffects()) {
+    while (!this.isDoneRendering()) {
       await new Promise((resolve) => setTimeout(resolve, 100));
       this.render();
     }
     this.emit("renderComplete");
   }
+  isDoneRendering() {
+    return this._hasRenderedAtleastOnce && !this._hasIncompleteAsyncEffects();
+  }
   _hasIncompleteAsyncEffects() {
     if (this._asyncEffectPhaseById.size > 0) return true;
+    if (this._hasUnrenderedUpdatesFromAsyncEffects) return true;
     return this.children.some((child) => child._hasIncompleteAsyncEffects());
   }
   _hasIncompleteAsyncEffectsForPhase(phase) {
@@ -22674,6 +22763,7 @@ var IsolatedCircuit = class {
     }
     this._asyncEffectPhaseById.delete(asyncEffectId);
     this._runningAsyncEffectsById.delete(asyncEffectId);
+    this._hasUnrenderedUpdatesFromAsyncEffects = true;
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1293",
+  "version": "0.0.1295",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",