@tscircuit/core 0.0.854 → 0.0.856

package/dist/index.d.ts

@@ -543,6 +543,7 @@ declare const netProps: z.ZodObject<{
 }>;
 declare class Net extends PrimitiveComponent<typeof netProps> {
     source_net_id?: string;
+    subcircuit_connectivity_map_key: string | null;
     get config(): {
         componentName: string;
         zodProps: z.ZodObject<{
@@ -24539,6 +24540,7 @@ declare class Via extends PrimitiveComponent<typeof viaProps> {
     matchedPort: Port | null;
     isPcbPrimitive: boolean;
     source_manually_placed_via_id: string | null;
+    subcircuit_connectivity_map_key: string | null;
     constructor(props: z.input<typeof viaProps>);
     get config(): {
         componentName: string;
@@ -24752,6 +24754,10 @@ declare class Via extends PrimitiveComponent<typeof viaProps> {
     }): void;
     _getLayers(): LayerRef[];
     initPorts(): void;
+    /**
+     * Find the Net or Trace that this via is connected to
+     */
+    _getConnectedNetOrTrace(): Net | Trace | null;
     doInitialPcbComponentRender(): void;
     doInitialSourceRender(): void;
     doInitialPcbPrimitiveRender(): void;

package/dist/index.js

@@ -1654,6 +1654,7 @@ var netProps = z4.object({
 });
 var Net = class extends PrimitiveComponent2 {
   source_net_id;
+  subcircuit_connectivity_map_key = null;
   get config() {
     return {
       componentName: "Net",
@@ -10495,6 +10496,8 @@ function Group_doInitialSourceAddConnectivityMapKey(group) {
   if (!group.isSubcircuit) return;
   const { db } = group.root;
   const traces = group.selectAll("trace");
+  const vias = group.selectAll("via");
+  const nets = group.selectAll("net");
   const connMap = new ConnectivityMap2({});
   connMap.addConnections(
     traces.map((t) => {
@@ -10509,6 +10512,10 @@ function Group_doInitialSourceAddConnectivityMapKey(group) {
       ];
     }).filter((c) => c !== null)
   );
+  const sourceNets = db.source_net.list().filter((net) => net.subcircuit_id === group.subcircuit_id);
+  for (const sourceNet of sourceNets) {
+    connMap.addConnections([[sourceNet.source_net_id]]);
+  }
   const { name: subcircuitName } = group._parsedProps;
   for (const trace of traces) {
     if (!trace.source_trace_id) continue;
@@ -10549,6 +10556,9 @@ function Group_doInitialSourceAddConnectivityMapKey(group) {
       allSourceNetIds.add(source_net_id);
     }
   }
+  for (const sourceNet of sourceNets) {
+    allSourceNetIds.add(sourceNet.source_net_id);
+  }
   for (const netId of allSourceNetIds) {
     const connNetId = connMap.getNetConnectedToId(netId);
     if (!connNetId) continue;
@@ -10556,6 +10566,17 @@ function Group_doInitialSourceAddConnectivityMapKey(group) {
     db.source_net.update(netId, {
       subcircuit_connectivity_map_key: connectivityMapKey
     });
+    const netInstance = nets.find((n) => n.source_net_id === netId);
+    if (netInstance) {
+      netInstance.subcircuit_connectivity_map_key = connectivityMapKey;
+    }
+  }
+  for (const via of vias) {
+    const connectedNetOrTrace = via._getConnectedNetOrTrace();
+    if (!connectedNetOrTrace) continue;
+    if (connectedNetOrTrace.subcircuit_connectivity_map_key) {
+      via.subcircuit_connectivity_map_key = connectedNetOrTrace.subcircuit_connectivity_map_key;
+    }
   }
 }
 
@@ -16265,6 +16286,7 @@ var Via = class extends PrimitiveComponent2 {
   matchedPort = null;
   isPcbPrimitive = true;
   source_manually_placed_via_id = null;
+  subcircuit_connectivity_map_key = null;
   constructor(props) {
     super(props);
     const layers = this._getLayers();
@@ -16323,6 +16345,24 @@ var Via = class extends PrimitiveComponent2 {
     port.registerMatch(this);
     this.add(port);
   }
+  /**
+   * Find the Net or Trace that this via is connected to
+   */
+  _getConnectedNetOrTrace() {
+    const connectsTo = this._parsedProps.connectsTo;
+    if (!connectsTo) return null;
+    const subcircuit = this.getSubcircuit();
+    const selectors = Array.isArray(connectsTo) ? connectsTo : [connectsTo];
+    for (const selector of selectors) {
+      if (selector.startsWith("net.")) {
+        const net = subcircuit.selectOne(selector, {
+          type: "net"
+        });
+        if (net) return net;
+      }
+    }
+    return null;
+  }
   doInitialPcbComponentRender() {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
@@ -16368,6 +16408,7 @@ var Via = class extends PrimitiveComponent2 {
       from_layer: props.fromLayer || "bottom",
       to_layer: props.toLayer || "top",
       subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+      subcircuit_connectivity_map_key: this.subcircuit_connectivity_map_key ?? void 0,
       pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0,
       net_is_assignable: props.netIsAssignable ?? void 0
     });
@@ -17674,7 +17715,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.853",
+  version: "0.0.855",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -17709,7 +17750,7 @@ var package_default = {
     "@tscircuit/checks": "^0.0.85",
     "@tscircuit/circuit-json-util": "^0.0.72",
     "@tscircuit/common": "^0.0.20",
-    "@tscircuit/copper-pour-solver": "^0.0.12",
+    "@tscircuit/copper-pour-solver": "^0.0.14",
     "@tscircuit/footprinter": "^0.0.236",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
@@ -17732,7 +17773,7 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.304",
+    "circuit-json": "^0.0.306",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-gltf": "^0.0.31",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.854",
+  "version": "0.0.856",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -36,7 +36,7 @@
     "@tscircuit/checks": "^0.0.85",
     "@tscircuit/circuit-json-util": "^0.0.72",
     "@tscircuit/common": "^0.0.20",
-    "@tscircuit/copper-pour-solver": "^0.0.12",
+    "@tscircuit/copper-pour-solver": "^0.0.14",
     "@tscircuit/footprinter": "^0.0.236",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
@@ -59,7 +59,7 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.304",
+    "circuit-json": "^0.0.306",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-gltf": "^0.0.31",