@tscircuit/schematic-trace-solver 0.0.166 → 0.0.167

package/dist/index.d.ts

@@ -141,7 +141,11 @@ interface InputDirectConnection {
 interface InputNetConnection {
     netId: string;
     pinIds: Array<PinId>;
-    /** True when the authoritative source net is electrical ground. */
+    /**
+     * Preserve explicitly wired islands on this ground net, joining the islands
+     * electrically through labels instead of routing between them. Nets without
+     * explicit traces, or without this hint, retain automatic bus routing.
+     */
     isGround?: boolean;
     /**
      * User-facing text to render for this net label. `netId` remains the stable

package/dist/index.js

@@ -369,10 +369,17 @@ var MAX_LOCAL_GROUND_BRANCH_OFFSET = 1;
 var getGroundConnectionPolicy = (inputProblem) => {
   const { netConnMap } = getConnectivityMapsFromInputProblem(inputProblem);
   const groundNetId = netConnMap.getNetConnectedToId("GND");
-  if (!groundNetId) return () => true;
   const physicalConnMap = new ConnectivityMap2({});
+  const explicitlyWiredGroundNetIds = /* @__PURE__ */ new Set();
   for (const connection of inputProblem.directConnections) {
     physicalConnMap.addConnections([connection.pinIds]);
+    const globalNetId = netConnMap.getNetConnectedToId(connection.pinIds[0]);
+    const isMarkedGround = inputProblem.netConnections.some(
+      (net) => net.isGround && netConnMap.getNetConnectedToId(net.netId) === globalNetId
+    );
+    if (globalNetId && isMarkedGround) {
+      explicitlyWiredGroundNetIds.add(globalNetId);
+    }
   }
   const pins = new Map(
     inputProblem.chips.flatMap(
@@ -388,13 +395,28 @@ var getGroundConnectionPolicy = (inputProblem) => {
       ({ pin: b }) => a.pinId !== b.pinId && Math.abs(a.y - b.y) < 1e-6 && Math.abs(a.x - b.x) > 1e-6 && physicalConnMap.getNetConnectedToId(b.pinId) === group
     );
   });
-  if (!hasExplicitParallelGroundRail) return () => true;
+  const areSeparateExplicitGroundIslands = (firstPinId, secondPinId) => {
+    const firstGlobalNetId = netConnMap.getNetConnectedToId(firstPinId);
+    const secondGlobalNetId = netConnMap.getNetConnectedToId(secondPinId);
+    if (!firstGlobalNetId || firstGlobalNetId !== secondGlobalNetId || !explicitlyWiredGroundNetIds.has(firstGlobalNetId)) {
+      return false;
+    }
+    const firstPhysicalGroup = physicalConnMap.getNetConnectedToId(firstPinId) ?? `pin:${firstPinId}`;
+    const secondPhysicalGroup = physicalConnMap.getNetConnectedToId(secondPinId) ?? `pin:${secondPinId}`;
+    return firstPhysicalGroup !== secondPhysicalGroup;
+  };
+  if (!hasExplicitParallelGroundRail) {
+    return (firstPinId, secondPinId) => !areSeparateExplicitGroundIslands(firstPinId, secondPinId);
+  }
   const isGroundFacingTerminal = (pinId) => {
     const entry = pins.get(pinId);
     return entry?.chip.pins.length === 2 && !physicalConnMap.getNetConnectedToId(pinId) && (entry.pin._facingDirection ?? getPinDirection(entry.pin, entry.chip)) === "y-";
   };
   return (firstPinId, secondPinId) => {
-    if (!groundNetId || netConnMap.getNetConnectedToId(firstPinId) !== groundNetId || netConnMap.getNetConnectedToId(secondPinId) !== groundNetId) {
+    const firstGlobalNetId = netConnMap.getNetConnectedToId(firstPinId);
+    const secondGlobalNetId = netConnMap.getNetConnectedToId(secondPinId);
+    if (areSeparateExplicitGroundIslands(firstPinId, secondPinId)) return false;
+    if (!groundNetId || firstGlobalNetId !== groundNetId || secondGlobalNetId !== groundNetId) {
       return true;
     }
     if (!isGroundFacingTerminal(firstPinId) && !isGroundFacingTerminal(secondPinId))

package/lib/solvers/MspConnectionPairSolver/getGroundConnectionPolicy.ts

@@ -11,12 +11,21 @@ const MAX_LOCAL_GROUND_BRANCH_OFFSET = 1
 export const getGroundConnectionPolicy = (inputProblem: InputProblem) => {
   const { netConnMap } = getConnectivityMapsFromInputProblem(inputProblem)
   const groundNetId = netConnMap.getNetConnectedToId("GND")
-  if (!groundNetId) return () => true
   // Net identifiers do not constitute physical edges: two separate direct
   // connections may have the same netId without requesting a wire between them.
   const physicalConnMap = new ConnectivityMap({})
+  const explicitlyWiredGroundNetIds = new Set<string>()
   for (const connection of inputProblem.directConnections) {
     physicalConnMap.addConnections([connection.pinIds])
+    const globalNetId = netConnMap.getNetConnectedToId(connection.pinIds[0])
+    const isMarkedGround = inputProblem.netConnections.some(
+      (net) =>
+        net.isGround &&
+        netConnMap.getNetConnectedToId(net.netId) === globalNetId,
+    )
+    if (globalNetId && isMarkedGround) {
+      explicitlyWiredGroundNetIds.add(globalNetId)
+    }
   }
   const pins = new Map(
     inputProblem.chips.flatMap((chip) =>
@@ -46,7 +55,29 @@ export const getGroundConnectionPolicy = (inputProblem: InputProblem) => {
       )
     )
   })
-  if (!hasExplicitParallelGroundRail) return () => true
+  const areSeparateExplicitGroundIslands = (
+    firstPinId: PinId,
+    secondPinId: PinId,
+  ) => {
+    const firstGlobalNetId = netConnMap.getNetConnectedToId(firstPinId)
+    const secondGlobalNetId = netConnMap.getNetConnectedToId(secondPinId)
+    if (
+      !firstGlobalNetId ||
+      firstGlobalNetId !== secondGlobalNetId ||
+      !explicitlyWiredGroundNetIds.has(firstGlobalNetId)
+    ) {
+      return false
+    }
+    const firstPhysicalGroup =
+      physicalConnMap.getNetConnectedToId(firstPinId) ?? `pin:${firstPinId}`
+    const secondPhysicalGroup =
+      physicalConnMap.getNetConnectedToId(secondPinId) ?? `pin:${secondPinId}`
+    return firstPhysicalGroup !== secondPhysicalGroup
+  }
+  if (!hasExplicitParallelGroundRail) {
+    return (firstPinId: PinId, secondPinId: PinId) =>
+      !areSeparateExplicitGroundIslands(firstPinId, secondPinId)
+  }
   const isGroundFacingTerminal = (pinId: PinId) => {
     const entry = pins.get(pinId)
     return (
@@ -58,10 +89,13 @@ export const getGroundConnectionPolicy = (inputProblem: InputProblem) => {
   }
 
   return (firstPinId: PinId, secondPinId: PinId): boolean => {
+    const firstGlobalNetId = netConnMap.getNetConnectedToId(firstPinId)
+    const secondGlobalNetId = netConnMap.getNetConnectedToId(secondPinId)
+    if (areSeparateExplicitGroundIslands(firstPinId, secondPinId)) return false
     if (
       !groundNetId ||
-      netConnMap.getNetConnectedToId(firstPinId) !== groundNetId ||
-      netConnMap.getNetConnectedToId(secondPinId) !== groundNetId
+      firstGlobalNetId !== groundNetId ||
+      secondGlobalNetId !== groundNetId
     ) {
       return true
     }

package/lib/types/InputProblem.ts

@@ -98,7 +98,11 @@ export interface InputNetConnection {
   netId: string
   pinIds: Array<PinId>
 
-  /** True when the authoritative source net is electrical ground. */
+  /**
+   * Preserve explicitly wired islands on this ground net, joining the islands
+   * electrically through labels instead of routing between them. Nets without
+   * explicit traces, or without this hint, retain automatic bus routing.
+   */
   isGround?: boolean
 
   /**

package/package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/tscircuit/schematic-trace-solver.git"
   },
   "main": "dist/index.js",
-  "version": "0.0.166",
+  "version": "0.0.167",
   "type": "module",
   "scripts": {
     "start": "cosmos",