@tscircuit/core 0.0.1935 → 0.0.1937

package/dist/index.d.ts

@@ -108279,12 +108279,12 @@ declare const pcbViaProps: z.ZodObject<{
     }>>;
     schRelative: z.ZodOptional<z.ZodBoolean>;
     pcbRelative: z.ZodOptional<z.ZodBoolean>;
+    tented: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodBoolean, z.ZodEnum<["both_sides", "top_and_bottom_tented", "top_tented", "bottom_tented", "exposed"]>]>, "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed", boolean | "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed" | "both_sides">>;
     isTented: z.ZodOptional<z.ZodBoolean>;
     tentedOnTop: z.ZodOptional<z.ZodBoolean>;
     tentedOnBottom: z.ZodOptional<z.ZodBoolean>;
     outerDiameter: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     netIsAssignable: z.ZodOptional<z.ZodBoolean>;
-    tented: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodBoolean, z.ZodEnum<["both_sides", "top_and_bottom_tented", "top_tented", "bottom_tented", "exposed"]>]>, "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed", boolean | "both_sides" | "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed">>;
 }, "strip", z.ZodTypeAny, {
     symbol?: _tscircuit_props.SymbolProp | undefined;
     fromLayer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | "inner7" | "inner8" | undefined;
@@ -108340,12 +108340,12 @@ declare const pcbViaProps: z.ZodObject<{
     } | undefined;
     schRelative?: boolean | undefined;
     pcbRelative?: boolean | undefined;
+    tented?: "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed" | undefined;
     isTented?: boolean | undefined;
     tentedOnTop?: boolean | undefined;
     tentedOnBottom?: boolean | undefined;
     outerDiameter?: number | undefined;
     netIsAssignable?: boolean | undefined;
-    tented?: "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed" | undefined;
 }, {
     symbol?: _tscircuit_props.SymbolProp | undefined;
     fromLayer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | "inner7" | "inner8" | {
@@ -108409,12 +108409,12 @@ declare const pcbViaProps: z.ZodObject<{
     } | undefined;
     schRelative?: boolean | undefined;
     pcbRelative?: boolean | undefined;
+    tented?: boolean | "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed" | "both_sides" | undefined;
     isTented?: boolean | undefined;
     tentedOnTop?: boolean | undefined;
     tentedOnBottom?: boolean | undefined;
     outerDiameter?: string | number | undefined;
     netIsAssignable?: boolean | undefined;
-    tented?: boolean | "both_sides" | "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed" | undefined;
 }>;
 declare class PcbVia extends PrimitiveComponent<typeof pcbViaProps> {
     pcb_via_id: string | null;
@@ -108539,12 +108539,12 @@ declare class PcbVia extends PrimitiveComponent<typeof pcbViaProps> {
             }>>;
             schRelative: z.ZodOptional<z.ZodBoolean>;
             pcbRelative: z.ZodOptional<z.ZodBoolean>;
+            tented: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodBoolean, z.ZodEnum<["both_sides", "top_and_bottom_tented", "top_tented", "bottom_tented", "exposed"]>]>, "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed", boolean | "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed" | "both_sides">>;
             isTented: z.ZodOptional<z.ZodBoolean>;
             tentedOnTop: z.ZodOptional<z.ZodBoolean>;
             tentedOnBottom: z.ZodOptional<z.ZodBoolean>;
             outerDiameter: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
             netIsAssignable: z.ZodOptional<z.ZodBoolean>;
-            tented: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodBoolean, z.ZodEnum<["both_sides", "top_and_bottom_tented", "top_tented", "bottom_tented", "exposed"]>]>, "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed", boolean | "both_sides" | "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed">>;
         }, "strip", z.ZodTypeAny, {
             symbol?: _tscircuit_props.SymbolProp | undefined;
             fromLayer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | "inner7" | "inner8" | undefined;
@@ -108600,12 +108600,12 @@ declare class PcbVia extends PrimitiveComponent<typeof pcbViaProps> {
             } | undefined;
             schRelative?: boolean | undefined;
             pcbRelative?: boolean | undefined;
+            tented?: "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed" | undefined;
             isTented?: boolean | undefined;
             tentedOnTop?: boolean | undefined;
             tentedOnBottom?: boolean | undefined;
             outerDiameter?: number | undefined;
             netIsAssignable?: boolean | undefined;
-            tented?: "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed" | undefined;
         }, {
             symbol?: _tscircuit_props.SymbolProp | undefined;
             fromLayer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | "inner7" | "inner8" | {
@@ -108669,12 +108669,12 @@ declare class PcbVia extends PrimitiveComponent<typeof pcbViaProps> {
             } | undefined;
             schRelative?: boolean | undefined;
             pcbRelative?: boolean | undefined;
+            tented?: boolean | "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed" | "both_sides" | undefined;
             isTented?: boolean | undefined;
             tentedOnTop?: boolean | undefined;
             tentedOnBottom?: boolean | undefined;
             outerDiameter?: string | number | undefined;
             netIsAssignable?: boolean | undefined;
-            tented?: boolean | "both_sides" | "top_and_bottom_tented" | "top_tented" | "bottom_tented" | "exposed" | undefined;
         }>;
     };
     private _getLayers;

package/dist/index.js

@@ -3667,6 +3667,15 @@ var getViaDiameterDefaultsWithOverrides = (overrides, pcbStyle) => {
   };
 };
 
+// lib/utils/getViaTenting.ts
+var getViaTenting = (tented) => {
+  if (tented === void 0) return {};
+  return {
+    tented_on_top: tented === "top_tented" || tented === "top_and_bottom_tented",
+    tented_on_bottom: tented === "bottom_tented" || tented === "top_and_bottom_tented"
+  };
+};
+
 // lib/components/primitive-components/Via.ts
 import "zod";
 
@@ -4991,9 +5000,11 @@ var Via = class extends PrimitiveComponent2 {
     const position = this._getGlobalPcbPositionBeforeLayout();
     const subcircuit = this.getSubcircuit();
     const connectedNetOrTrace = this._getConnectedNetOrTrace();
+    const { isFlipped } = this._getPcbPrimitiveFlippedHelpers();
+    const viaTenting = getViaTenting(this._parsedProps.tented);
     const sourceTraceId = this.source_trace_id ?? (connectedNetOrTrace instanceof Net ? void 0 : connectedNetOrTrace?.source_trace_id);
     const sourceNetId = !sourceTraceId && connectedNetOrTrace instanceof Net ? connectedNetOrTrace.source_net_id : void 0;
-    const pcb_via3 = db.pcb_via.insert({
+    const pcb_via4 = db.pcb_via.insert({
       x: position.x,
       y: position.y,
       hole_diameter: holeDiameter,
@@ -5005,10 +5016,12 @@ var Via = class extends PrimitiveComponent2 {
       subcircuit_connectivity_map_key: this.subcircuit_connectivity_map_key ?? void 0,
       pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0,
       net_is_assignable: this._parsedProps.netIsAssignable ?? void 0,
+      tented_on_top: isFlipped ? viaTenting.tented_on_bottom : viaTenting.tented_on_top,
+      tented_on_bottom: isFlipped ? viaTenting.tented_on_top : viaTenting.tented_on_bottom,
       ...sourceTraceId ? { source_trace_id: sourceTraceId } : {},
       ...sourceNetId ? { source_net_id: sourceNetId } : {}
     });
-    this.pcb_via_id = pcb_via3.pcb_via_id;
+    this.pcb_via_id = pcb_via4.pcb_via_id;
   }
 };
 
@@ -5527,7 +5540,9 @@ function Trace_doInitialPcbManualTraceRender(trace) {
             ...restOfPoint,
             ...transformedPoint,
             from_layer: maybeFlipLayer(point6.from_layer),
-            to_layer: maybeFlipLayer(point6.to_layer)
+            to_layer: maybeFlipLayer(point6.to_layer),
+            tented_on_top: isFlipped ? point6.tented_on_bottom : point6.tented_on_top,
+            tented_on_bottom: isFlipped ? point6.tented_on_top : point6.tented_on_bottom
           };
         }
         return {
@@ -5583,8 +5598,8 @@ function Trace_doInitialPcbManualTraceRender(trace) {
             net_is_assignable: inflatedPcbVia?.net_is_assignable,
             net_assigned: inflatedPcbVia?.net_assigned,
             // Use the same footprint flip as the route and via layers above.
-            tented_on_top: isFlipped ? inflatedPcbVia?.tented_on_bottom : inflatedPcbVia?.tented_on_top,
-            tented_on_bottom: isFlipped ? inflatedPcbVia?.tented_on_top : inflatedPcbVia?.tented_on_bottom
+            tented_on_top: (isFlipped ? inflatedPcbVia?.tented_on_bottom : inflatedPcbVia?.tented_on_top) ?? point6.tented_on_top,
+            tented_on_bottom: (isFlipped ? inflatedPcbVia?.tented_on_top : inflatedPcbVia?.tented_on_bottom) ?? point6.tented_on_bottom
           });
         }
       }
@@ -9351,7 +9366,7 @@ var PcbTrace = class extends PrimitiveComponent2 {
     const { _parsedProps: props } = this;
     const container = this.getPrimitiveContainer();
     const subcircuit = this.getSubcircuit();
-    const { maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
+    const { isFlipped, maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
     const parentTransform = this._computePcbGlobalTransformBeforeLayout();
     const transformedRoute = props.route.map((point6) => {
       if (point6.route_type === "wire") {
@@ -9370,7 +9385,9 @@ var PcbTrace = class extends PrimitiveComponent2 {
           ...restOfPoint,
           ...transformedPoint,
           from_layer: maybeFlipLayer(point6.from_layer),
-          to_layer: maybeFlipLayer(point6.to_layer)
+          to_layer: maybeFlipLayer(point6.to_layer),
+          tented_on_top: isFlipped ? point6.tented_on_bottom : point6.tented_on_top,
+          tented_on_bottom: isFlipped ? point6.tented_on_top : point6.tented_on_bottom
         };
       }
       return {
@@ -9537,10 +9554,14 @@ var PcbVia = class extends PrimitiveComponent2 {
       holeDiameter,
       outerDiameter,
       netIsAssignable,
+      tented,
       isTented,
       tentedOnTop,
       tentedOnBottom
     } = this._parsedProps;
+    const viaTenting = getViaTenting(tented);
+    const topTenting = tentedOnTop ?? viaTenting.tented_on_top ?? isTented;
+    const bottomTenting = tentedOnBottom ?? viaTenting.tented_on_bottom ?? isTented;
     const subcircuit = this.getSubcircuit();
     const position = this._getGlobalPcbPositionBeforeLayout();
     const { isFlipped, maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
@@ -9562,8 +9583,8 @@ var PcbVia = class extends PrimitiveComponent2 {
       pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0,
       net_is_assignable: netIsAssignable,
       // Use the same footprint flip as the via layers above.
-      tented_on_top: (isFlipped ? tentedOnBottom : tentedOnTop) ?? isTented,
-      tented_on_bottom: (isFlipped ? tentedOnTop : tentedOnBottom) ?? isTented
+      tented_on_top: isFlipped ? bottomTenting : topTenting,
+      tented_on_bottom: isFlipped ? topTenting : bottomTenting
     });
     this.pcb_via_id = pcbVia.pcb_via_id;
   }
@@ -53693,11 +53714,29 @@ var getBusSrjConnectionNamesOrThrow = ({
   srjConnections,
   bus,
   sourceTraceId,
-  traceNameOrPortSelector
+  traceNameOrPortSelector,
+  busSourceTraces
 }) => {
-  const matchingSrjConnections = srjConnections.filter(
+  const directSrjConnections = srjConnections.filter(
     (srjConnection) => srjConnection.source_trace_id === sourceTraceId
   );
+  if (directSrjConnections.length > 0) {
+    return directSrjConnections.map((srjConnection) => srjConnection.name);
+  }
+  const sourceTrace = busSourceTraces.find(
+    (trace) => trace.source_trace_id === sourceTraceId
+  );
+  const connectedSourceTraces = busSourceTraces.filter(
+    (trace) => trace.source_trace_id === sourceTraceId || sourceTrace.subcircuit_connectivity_map_key !== void 0 && trace.subcircuit_connectivity_map_key === sourceTrace.subcircuit_connectivity_map_key
+  );
+  const connectedSourceNetIds = new Set(
+    connectedSourceTraces.flatMap(
+      (trace) => trace.connected_source_net_ids ?? []
+    )
+  );
+  const matchingSrjConnections = srjConnections.filter(
+    (srjConnection) => connectedSourceNetIds.has(srjConnection.name)
+  );
   if (matchingSrjConnections.length === 0) {
     throw new Error(
       `Could not find an SRJ connection for "${traceNameOrPortSelector}" in bus "${bus.name}"`
@@ -53776,7 +53815,8 @@ var getBusesForSimpleRouteJson = ({
           srjConnections,
           bus,
           sourceTraceId,
-          traceNameOrPortSelector
+          traceNameOrPortSelector,
+          busSourceTraces
         });
       }
     );
@@ -63360,7 +63400,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1934",
+  version: "0.0.1936",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -63435,7 +63475,7 @@ var package_default = {
     "circuit-json-to-connectivity-map": "^0.0.30",
     "circuit-json-to-gltf": "^0.0.128",
     "circuit-json-to-spice": "^0.0.45",
-    "circuit-to-svg": "^0.0.422",
+    "circuit-to-svg": "^0.0.424",
     concurrently: "^9.1.2",
     "connectivity-map": "^1.0.0",
     debug: "^4.3.6",
@@ -68670,6 +68710,7 @@ function CopperPour_doInitialPcbCopperPourRender(copperPour) {
 }
 
 // lib/components/primitive-components/CopperPour/CopperPour_doInitialPcbViaStitchRender.ts
+import { pcb_via as pcb_via3 } from "circuit-json";
 var renderViaStitchingForCopperPours = (copperPour) => {
   const subcircuit = copperPour.getSubcircuit();
   if (!subcircuit.root) return;
@@ -68711,8 +68752,12 @@ var renderViaStitchingForCopperPours = (copperPour) => {
     throw new Error(solver.error ?? "Via stitching solver failed");
   }
   for (const pcbVia of solver.getOutput().pcbVias) {
-    const { pcb_via_id: _solverViaId, ...pcbViaInput } = pcbVia;
-    const insertedVia = db.pcb_via.insert(pcbViaInput);
+    const { pcb_via_id: _solverViaId, ...pcbViaInput } = pcb_via3.parse(pcbVia);
+    const insertedVia = db.pcb_via.insert({
+      ...pcbViaInput,
+      tented_on_top: void 0,
+      tented_on_bottom: void 0
+    });
     boardComponent?._generatedStitchingViaIds?.add(insertedVia.pcb_via_id);
   }
 };
@@ -69522,6 +69567,7 @@ var Board = class extends Group5 {
     const pcbBoardFromCircuitJson = circuitJsonElements?.find(
       (elm) => elm.type === "pcb_board"
     );
+    const viaTenting = getViaTenting(props.defaultViaTenting);
     const rawProps = this.props;
     const resolvedIsViaInPadAllowed = rawProps.isViaInPadAllowed ?? pcbBoardFromCircuitJson?.is_via_in_pad_allowed;
     const resolvedAllowBlindAndBuriedVias = rawProps.allowBlindAndBuriedVias ?? pcbBoardFromCircuitJson?.allow_blind_and_buried_vias;
@@ -69579,7 +69625,10 @@ var Board = class extends Group5 {
     const resolvedMinViaPadDiameter = subcircuitProps2.minViaPadDiameter ?? (pcbStyle?.viaPadDiameter !== void 0 ? styledViaDimensions.padDiameter : configuredViaHoleDiameter !== void 0 ? configuredViaHoleDiameter + DEFAULT_VIA_PAD_DIAMETER_OVER_HOLE_DIAMETER_MM : jlcMinTolerances.min_via_pad_diameter);
     const pcb_board = db.pcb_board.insert({
       source_board_id: this.source_board_id,
+      subcircuit_id: this.subcircuit_id ?? void 0,
       center,
+      default_via_tented_on_top: viaTenting.tented_on_top ?? pcbBoardFromCircuitJson?.default_via_tented_on_top,
+      default_via_tented_on_bottom: viaTenting.tented_on_bottom ?? pcbBoardFromCircuitJson?.default_via_tented_on_bottom,
       thickness: this.boardThickness,
       num_layers: this.allLayers.length,
       width: computedWidth,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1935",
+  "version": "0.0.1937",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -76,7 +76,7 @@
     "circuit-json-to-connectivity-map": "^0.0.30",
     "circuit-json-to-gltf": "^0.0.128",
     "circuit-json-to-spice": "^0.0.45",
-    "circuit-to-svg": "^0.0.422",
+    "circuit-to-svg": "^0.0.424",
     "concurrently": "^9.1.2",
     "connectivity-map": "^1.0.0",
     "debug": "^4.3.6",