@tscircuit/core 0.0.1361 → 0.0.1363

package/dist/index.js

@@ -4206,6 +4206,32 @@ var jlcMinTolerances = {
   min_via_pad_diameter: 0.3
 };
 
+// lib/utils/getViaSpanLayers.ts
+var getViaSpanLayers = ({
+  fromLayer,
+  toLayer,
+  layerCount
+}) => {
+  if (fromLayer === toLayer) return [fromLayer];
+  const stack = ["top"];
+  for (let i = 1; i <= layerCount - 2; i++) {
+    stack.push(`inner${i}`);
+  }
+  stack.push("bottom");
+  const fromIndex = stack.indexOf(fromLayer);
+  const toIndex = stack.indexOf(toLayer);
+  if (fromIndex === -1 || toIndex === -1) return [fromLayer, toLayer];
+  return fromIndex <= toIndex ? stack.slice(fromIndex, toIndex + 1) : stack.slice(toIndex, fromIndex + 1).reverse();
+};
+var getViaBoardLayers = (layerCount) => {
+  if (layerCount <= 1) return ["top"];
+  return getViaSpanLayers({
+    fromLayer: "top",
+    toLayer: "bottom",
+    layerCount
+  });
+};
+
 // lib/components/primitive-components/Trace/Trace_doInitialPcbTraceRender.ts
 var portToObjective = (port) => {
   const portPosition = port._getGlobalPcbPositionAfterLayout();
@@ -4301,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();
@@ -4513,19 +4559,29 @@ function Trace_doInitialPcbTraceRender(trace) {
     subcircuit_id: trace.getSubcircuit()?.subcircuit_id,
     trace_length: traceLength
   });
+  const subcircuitConnectivityMapKey = trace.subcircuit_connectivity_map_key ?? db.source_trace.get(trace.source_trace_id)?.subcircuit_connectivity_map_key;
   trace._portsRoutedOnPcb = ports;
   trace.pcb_trace_id = pcb_trace.pcb_trace_id;
   for (const point6 of mergedRoute) {
     if (point6.route_type === "via") {
+      const fromLayer = point6.from_layer;
+      const toLayer = point6.to_layer;
       db.pcb_via.insert({
         pcb_trace_id: pcb_trace.pcb_trace_id,
         x: point6.x,
         y: point6.y,
         hole_diameter: holeDiameter,
         outer_diameter: padDiameter,
-        layers: [point6.from_layer, point6.to_layer],
-        from_layer: point6.from_layer,
-        to_layer: point6.to_layer
+        layers: getViaSpanLayers({
+          fromLayer,
+          toLayer,
+          layerCount: subcircuit._getSubcircuitLayerCount()
+        }),
+        from_layer: fromLayer,
+        to_layer: toLayer,
+        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+        pcb_group_id: trace.getGroup()?.pcb_group_id ?? void 0,
+        subcircuit_connectivity_map_key: subcircuitConnectivityMapKey
       });
     }
   }
@@ -4756,6 +4812,7 @@ function Trace_doInitialPcbManualTraceRender(trace) {
     const { maybeFlipLayer } = trace._getPcbPrimitiveFlippedHelpers();
     const transform2 = trace._computePcbGlobalTransformBeforeLayout();
     const insertedRoutes = [];
+    const subcircuitConnectivityMapKey2 = trace.subcircuit_connectivity_map_key ?? db.source_trace.get(trace.source_trace_id)?.subcircuit_connectivity_map_key;
     for (const inflatedPcbTrace of inflatedPcbTraces) {
       const transformedRoute = inflatedPcbTrace.route.map((point6) => {
         if (point6.route_type === "wire") {
@@ -4809,10 +4866,11 @@ function Trace_doInitialPcbManualTraceRender(trace) {
           const toLayer = maybeFlipLayer(
             inflatedPcbVia?.to_layer ?? point6.to_layer
           );
-          const layers = (inflatedPcbVia?.layers ?? [
-            point6.from_layer,
-            point6.to_layer
-          ]).map((layer2) => maybeFlipLayer(layer2));
+          const layers = (inflatedPcbVia?.layers ?? getViaSpanLayers({
+            fromLayer: point6.from_layer,
+            toLayer: point6.to_layer,
+            layerCount: subcircuit._getSubcircuitLayerCount()
+          })).map((layer2) => maybeFlipLayer(layer2));
           db.pcb_via.insert({
             pcb_trace_id: pcb_trace2.pcb_trace_id,
             x: point6.x,
@@ -4824,7 +4882,7 @@ function Trace_doInitialPcbManualTraceRender(trace) {
             to_layer: toLayer,
             subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
             pcb_group_id: trace.getGroup()?.pcb_group_id ?? void 0,
-            subcircuit_connectivity_map_key: inflatedPcbVia?.subcircuit_connectivity_map_key,
+            subcircuit_connectivity_map_key: inflatedPcbVia?.subcircuit_connectivity_map_key ?? subcircuitConnectivityMapKey2,
             net_is_assignable: inflatedPcbVia?.net_is_assignable,
             net_assigned: inflatedPcbVia?.net_assigned,
             is_tented: inflatedPcbVia?.is_tented
@@ -5008,19 +5066,29 @@ function Trace_doInitialPcbManualTraceRender(trace) {
     pcb_group_id: trace.getGroup()?.pcb_group_id ?? void 0,
     trace_length: traceLength
   });
+  const subcircuitConnectivityMapKey = trace.subcircuit_connectivity_map_key ?? db.source_trace.get(trace.source_trace_id)?.subcircuit_connectivity_map_key;
   const pcbStyle = trace.getInheritedMergedProperty("pcbStyle");
   const { holeDiameter, padDiameter } = getViaDiameterDefaults(pcbStyle);
   for (const point6 of route) {
     if (point6.route_type === "via") {
+      const fromLayer = point6.from_layer;
+      const toLayer = point6.to_layer;
       db.pcb_via.insert({
         pcb_trace_id: pcb_trace.pcb_trace_id,
         x: point6.x,
         y: point6.y,
         hole_diameter: holeDiameter,
         outer_diameter: padDiameter,
-        layers: [point6.from_layer, point6.to_layer],
-        from_layer: point6.from_layer,
-        to_layer: point6.to_layer
+        layers: getViaSpanLayers({
+          fromLayer,
+          toLayer,
+          layerCount: subcircuit._getSubcircuitLayerCount()
+        }),
+        from_layer: fromLayer,
+        to_layer: toLayer,
+        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+        pcb_group_id: trace.getGroup()?.pcb_group_id ?? void 0,
+        subcircuit_connectivity_map_key: subcircuitConnectivityMapKey
       });
     }
   }
@@ -7241,26 +7309,6 @@ import { viaProps } from "@tscircuit/props";
 import {
   layer_ref
 } from "circuit-json";
-
-// lib/utils/getViaSpanLayers.ts
-var getViaSpanLayers = ({
-  fromLayer,
-  toLayer,
-  layerCount
-}) => {
-  if (fromLayer === toLayer) return [fromLayer];
-  const stack = ["top"];
-  for (let i = 1; i <= layerCount - 2; i++) {
-    stack.push(`inner${i}`);
-  }
-  stack.push("bottom");
-  const fromIndex = stack.indexOf(fromLayer);
-  const toIndex = stack.indexOf(toLayer);
-  if (fromIndex === -1 || toIndex === -1) return [fromLayer, toLayer];
-  return fromIndex <= toIndex ? stack.slice(fromIndex, toIndex + 1) : stack.slice(toIndex, fromIndex + 1).reverse();
-};
-
-// lib/components/primitive-components/PcbVia.ts
 import { z as z6 } from "zod";
 var pcbViaProps = viaProps.extend({
   layers: z6.array(layer_ref).optional(),
@@ -22803,21 +22851,39 @@ var Group5 = class extends NormalComponent3 {
         continue;
       }
       if (pcb_trace.type === "pcb_trace") {
+        const sourceTraceId = getSourceTraceIdForRoutedTrace({
+          db,
+          trace: pcb_trace,
+          subcircuit_id: this.subcircuit_id
+        });
+        const { connection_name: inputConnectionName } = pcb_trace;
+        let subcircuitConnectivityMapKey;
+        if (sourceTraceId) {
+          subcircuitConnectivityMapKey = db.source_trace.get(sourceTraceId)?.subcircuit_connectivity_map_key;
+        }
+        if (!subcircuitConnectivityMapKey && inputConnectionName) {
+          const sourceNet = db.source_net.get(inputConnectionName);
+          if (sourceNet) {
+            subcircuitConnectivityMapKey = sourceNet.subcircuit_connectivity_map_key;
+          }
+        }
         for (const point6 of pcb_trace.route) {
           if (point6.route_type === "via") {
             const routedViaPoint = point6;
+            const fromLayer = point6.from_layer;
+            const toLayer = point6.to_layer;
             db.pcb_via.insert({
               pcb_trace_id: pcb_trace.pcb_trace_id,
               x: point6.x,
               y: point6.y,
               hole_diameter: routedViaPoint.via_hole_diameter ?? routedViaPoint.hole_diameter ?? routedViaHoleDiameter,
               outer_diameter: routedViaPoint.via_diameter ?? routedViaPoint.outer_diameter ?? routedViaPadDiameter,
-              layers: [
-                point6.from_layer,
-                point6.to_layer
-              ],
-              from_layer: point6.from_layer,
-              to_layer: point6.to_layer
+              layers: getViaBoardLayers(this._getSubcircuitLayerCount()),
+              from_layer: fromLayer,
+              to_layer: toLayer,
+              subcircuit_id: this.subcircuit_id,
+              pcb_group_id: this.pcb_group_id ?? void 0,
+              subcircuit_connectivity_map_key: subcircuitConnectivityMapKey
             });
           }
         }
@@ -24240,7 +24306,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1360",
+  version: "0.0.1362",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -24277,7 +24343,7 @@ var package_default = {
     "@tscircuit/checks": "0.0.138",
     "@tscircuit/circuit-json-util": "^0.0.96",
     "@tscircuit/common": "^0.0.20",
-    "@tscircuit/copper-pour-solver": "^0.0.34",
+    "@tscircuit/copper-pour-solver": "0.0.35",
     "@tscircuit/footprinter": "^0.0.357",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/infer-cable-insertion-point": "^0.0.2",
@@ -24288,11 +24354,11 @@ var package_default = {
     "@tscircuit/matchpack": "^0.0.29",
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
-    "@tscircuit/props": "^0.0.555",
     "@tscircuit/ngspice-spice-engine": "^0.0.18",
+    "@tscircuit/props": "^0.0.558",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
-    "@tscircuit/solver-utils": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.72",
+    "@tscircuit/solver-utils": "^0.0.16",
     "@tscircuit/soup-util": "^0.0.41",
     "@types/bun": "^1.2.16",
     "@types/debug": "^4.1.12",
@@ -25333,6 +25399,47 @@ var Subcircuit = class extends Group5 {
   doInitialRenderIsolatedSubcircuits() {
     Subcircuit_doInitialRenderIsolatedSubcircuits(this);
   }
+  doInitialCreateNetsFromProps() {
+    super.doInitialCreateNetsFromProps();
+    this._createTracesForExposedNets();
+  }
+  _createTracesForExposedNets() {
+    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 childNetSelector = `.${this.name} > net.${netName}`;
+      const traceName = `exposed_net.${netName}`;
+      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(
+        (child) => child instanceof Trace3 && child._parsedProps.name === traceName
+      );
+      if (existingTrace) continue;
+      parentSubcircuit.add(
+        new Trace3({
+          name: traceName,
+          from: childNetSelector,
+          to: parentNetSelector,
+          displayName: netName
+        })
+      );
+    }
+  }
+  _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
@@ -25361,6 +25468,7 @@ var Subcircuit = class extends Group5 {
     inflateCircuitJson(this, circuitJson, children);
   }
 };
+var normalizeExposedNetName = (netName) => netName.startsWith("net.") ? netName.slice("net.".length) : netName;
 
 // lib/components/normal-components/MountedBoard.ts
 var MountedBoard = class extends Subcircuit {
@@ -29153,6 +29261,7 @@ var CopperPour = class extends PrimitiveComponent2 {
       const clearance = props.clearance ?? 0.2;
       const inputProblem = convertCircuitJsonToInputProblem(circuitJson, {
         layer: props.layer,
+        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
         source_net_id: net.source_net_id,
         pad_margin: props.padMargin ?? clearance,
         trace_margin: props.traceMargin ?? clearance,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1361",
+  "version": "0.0.1363",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -38,7 +38,7 @@
     "@tscircuit/checks": "0.0.138",
     "@tscircuit/circuit-json-util": "^0.0.96",
     "@tscircuit/common": "^0.0.20",
-    "@tscircuit/copper-pour-solver": "^0.0.34",
+    "@tscircuit/copper-pour-solver": "0.0.35",
     "@tscircuit/footprinter": "^0.0.357",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/infer-cable-insertion-point": "^0.0.2",
@@ -49,11 +49,11 @@
     "@tscircuit/matchpack": "^0.0.29",
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
-    "@tscircuit/props": "^0.0.555",
     "@tscircuit/ngspice-spice-engine": "^0.0.18",
+    "@tscircuit/props": "^0.0.558",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
-    "@tscircuit/solver-utils": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.72",
+    "@tscircuit/solver-utils": "^0.0.16",
     "@tscircuit/soup-util": "^0.0.41",
     "@types/bun": "^1.2.16",
     "@types/debug": "^4.1.12",