@tscircuit/core 0.0.1362 → 0.0.1363

package/dist/index.d.ts

@@ -3084,6 +3084,7 @@ declare class Board extends Group<typeof boardProps> implements BoardI, Subcircu
             outlineOffsetY: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             circuitJson: zod.ZodOptional<zod.ZodArray<zod.ZodAny, "many">>;
             exposedNets: zod.ZodOptional<zod.ZodArray<zod.ZodString, "many">>;
+            exposeNets: zod.ZodOptional<zod.ZodBoolean>;
             minTraceWidth: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             minViaHoleEdgeToViaHoleEdgeClearance: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             minViaEdgeToPadEdgeClearance: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
@@ -3558,6 +3559,7 @@ declare class Board extends Group<typeof boardProps> implements BoardI, Subcircu
             autorouterVersion?: "v1" | "v2" | "v3" | "v4" | "v5" | "v6" | "latest" | undefined;
             circuitJson?: any[] | undefined;
             exposedNets?: string[] | undefined;
+            exposeNets?: boolean | undefined;
             schAutoLayoutEnabled?: boolean | undefined;
             schTraceAutoLabelEnabled?: boolean | undefined;
             schMaxTraceDistance?: number | undefined;
@@ -3894,6 +3896,7 @@ declare class Board extends Group<typeof boardProps> implements BoardI, Subcircu
             autorouterVersion?: "v1" | "v2" | "v3" | "v4" | "v5" | "v6" | "latest" | undefined;
             circuitJson?: any[] | undefined;
             exposedNets?: string[] | undefined;
+            exposeNets?: boolean | undefined;
             schAutoLayoutEnabled?: boolean | undefined;
             schTraceAutoLabelEnabled?: boolean | undefined;
             schMaxTraceDistance?: string | number | undefined;
@@ -4021,6 +4024,7 @@ declare class Subcircuit extends Group<typeof subcircuitProps> implements Subcir
     doInitialRenderIsolatedSubcircuits(): void;
     doInitialCreateNetsFromProps(): void;
     private _createTracesForExposedNets;
+    private _getNetNamesToExpose;
     /**
      * During this phase, we inflate the subcircuit circuit json into class
      * instances
@@ -4623,6 +4627,7 @@ declare class MountedBoard extends Subcircuit implements BoardI {
             outlineOffsetY: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             circuitJson: zod.ZodOptional<zod.ZodArray<zod.ZodAny, "many">>;
             exposedNets: zod.ZodOptional<zod.ZodArray<zod.ZodString, "many">>;
+            exposeNets: zod.ZodOptional<zod.ZodBoolean>;
             minTraceWidth: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             minViaHoleEdgeToViaHoleEdgeClearance: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             minViaEdgeToPadEdgeClearance: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
@@ -5213,6 +5218,7 @@ declare class MountedBoard extends Subcircuit implements BoardI {
             autorouterVersion?: "v1" | "v2" | "v3" | "v4" | "v5" | "v6" | "latest" | undefined;
             circuitJson?: any[] | undefined;
             exposedNets?: string[] | undefined;
+            exposeNets?: boolean | undefined;
             schAutoLayoutEnabled?: boolean | undefined;
             schTraceAutoLabelEnabled?: boolean | undefined;
             schMaxTraceDistance?: number | undefined;
@@ -5572,6 +5578,7 @@ declare class MountedBoard extends Subcircuit implements BoardI {
             autorouterVersion?: "v1" | "v2" | "v3" | "v4" | "v5" | "v6" | "latest" | undefined;
             circuitJson?: any[] | undefined;
             exposedNets?: string[] | undefined;
+            exposeNets?: boolean | undefined;
             schAutoLayoutEnabled?: boolean | undefined;
             schTraceAutoLabelEnabled?: boolean | undefined;
             schMaxTraceDistance?: string | number | undefined;

package/dist/index.js

@@ -4327,10 +4327,30 @@ function Trace_doInitialPcbTraceRender(trace) {
   }
   const nets = trace._findConnectedNets().netsWithSelectors;
   if (ports.length === 0 && nets.length === 2) {
-    trace.renderError(
-      `Trace connects two nets, we haven't implemented a way to route this yet`
-    );
-    return;
+    const [netA, netB] = nets.map(({ net }) => net);
+    const netAPorts = netA.getAllConnectedPorts();
+    const netBPorts = netB.getAllConnectedPorts();
+    if (netAPorts.length === 0 || netBPorts.length === 0) {
+      console.log(
+        "Nothing to connect this net to, one of the nets is empty. TODO should emit a warning!"
+      );
+      return;
+    }
+    let closestPortPair = [netAPorts[0], netBPorts[0]];
+    let closestDistance = Infinity;
+    for (const netAPort of netAPorts) {
+      const closestNetBPort = getClosest(netAPort, netBPorts);
+      const netAPortPosition = netAPort._getGlobalPcbPositionBeforeLayout();
+      const netBPortPosition = closestNetBPort._getGlobalPcbPositionBeforeLayout();
+      const distance19 = Math.sqrt(
+        (netAPortPosition.x - netBPortPosition.x) ** 2 + (netAPortPosition.y - netBPortPosition.y) ** 2
+      );
+      if (distance19 < closestDistance) {
+        closestDistance = distance19;
+        closestPortPair = [netAPort, closestNetBPort];
+      }
+    }
+    ports.push(...closestPortPair);
   } else if (ports.length === 1 && nets.length === 1) {
     const port = ports[0];
     const portsInNet = nets[0].net.getAllConnectedPorts();
@@ -24286,7 +24306,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1361",
+  version: "0.0.1362",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -24335,7 +24355,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.18",
-    "@tscircuit/props": "^0.0.557",
+    "@tscircuit/props": "^0.0.558",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.72",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -25384,17 +25404,20 @@ var Subcircuit = class extends Group5 {
     this._createTracesForExposedNets();
   }
   _createTracesForExposedNets() {
-    const exposedNets = this._parsedProps.exposedNets;
+    const exposedNets = this._getNetNamesToExpose();
     if (!exposedNets?.length) return;
     const parentSubcircuit = this.parent?.getSubcircuit?.();
     if (!parentSubcircuit) return;
     if (!this.name) return;
     for (const exposedNetName of exposedNets) {
       const netName = normalizeExposedNetName(exposedNetName);
-      const parentNetSelector = `net.${netName}`;
+      const parentNetSelector = `> net.${netName}`;
       const childNetSelector = `.${this.name} > net.${netName}`;
       const traceName = `exposed_net.${netName}`;
-      if (!parentSubcircuit.selectOne(parentNetSelector, { type: "net" })) {
+      const parentHasDirectNet = parentSubcircuit.children.some(
+        (child) => child instanceof Net && child._parsedProps.name === netName
+      );
+      if (!parentHasDirectNet) {
         parentSubcircuit.add(new Net({ name: netName }));
       }
       const existingTrace = parentSubcircuit.children.find(
@@ -25411,6 +25434,12 @@ var Subcircuit = class extends Group5 {
       );
     }
   }
+  _getNetNamesToExpose() {
+    const explicitExposedNets = this._parsedProps.exposedNets ?? [];
+    if (!this._parsedProps.exposeNets) return explicitExposedNets;
+    const childNetNames = this.selectAll("net").filter((net) => net instanceof Net && net.getSubcircuit() === this).map((net) => net._parsedProps.name);
+    return Array.from(/* @__PURE__ */ new Set([...explicitExposedNets, ...childNetNames]));
+  }
   /**
    * During this phase, we inflate the subcircuit circuit json into class
    * instances

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1362",
+  "version": "0.0.1363",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -50,7 +50,7 @@
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.18",
-    "@tscircuit/props": "^0.0.557",
+    "@tscircuit/props": "^0.0.558",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.72",
     "@tscircuit/solver-utils": "^0.0.16",