@tscircuit/core 0.0.1289 → 0.0.1291

package/dist/index.d.ts

@@ -2167,6 +2167,7 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
         ignoreSymbolPorts?: boolean;
     }): void;
     _getImpliedFootprintString(): string | null;
+    resolveFootprint(): any;
     _addChildrenFromStringFootprint(): void;
     get portMap(): PortMap<PortNames>;
     getInstanceForReactElement(element: ReactElement): NormalComponent | null;
@@ -43470,6 +43471,10 @@ declare class Interconnect extends NormalComponent<typeof interconnectProps> {
 
 declare class SolderJumper<PinLabels extends string = never> extends NormalComponent<typeof solderjumperProps, PinLabels> {
     schematicDimensions: SchematicBoxDimensions | null;
+    private _getPinCountFromFootprintString;
+    private _getPinNumberFromBridgedPinsProp;
+    private _getBridgedPinNumbersForFootprint;
+    resolveFootprint(): any;
     _getPinNumberFromBridgedPinName(pinName: string): number | null;
     get defaultInternallyConnectedPinNames(): string[][];
     get config(): {

package/dist/index.js

@@ -10853,8 +10853,7 @@ var extractCadModelFromCircuitJson = (circuitJson) => {
 
 // lib/components/base-components/NormalComponent/NormalComponent_doInitialPcbFootprintStringRender.ts
 function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsyncEffect) {
-  let { footprint } = component.props;
-  footprint ??= component._getImpliedFootprintString?.();
+  const footprint = component.resolveFootprint();
   if (!footprint) return;
   const { pcbRotation, pinLabels, pcbPinLabels } = component.props;
   const fileExtension = getFileExtension(String(footprint));
@@ -11817,10 +11816,13 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
   _getImpliedFootprintString() {
     return null;
   }
+  // Override to choose the effective footprint without rewriting user props.
+  resolveFootprint() {
+    return this._parsedProps.footprint ?? this.props.footprint ?? this._getImpliedFootprintString?.();
+  }
   _addChildrenFromStringFootprint() {
     const { pcbRotation, pinLabels, pcbPinLabels } = this.props;
-    let footprint = this._parsedProps.footprint ?? this.props.footprint;
-    footprint ??= this._getImpliedFootprintString?.();
+    const footprint = this.resolveFootprint();
     if (!footprint) return;
     if (typeof footprint === "string") {
       if (isHttpUrl(footprint)) return;
@@ -12115,7 +12117,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       obstructs_within_bounds: props.obstructsWithinBounds ?? true,
       metadata: props.kicadFootprintMetadata ? { kicad_footprint: props.kicadFootprintMetadata } : void 0
     });
-    const footprint = props.footprint ?? this._getImpliedFootprintString();
+    const footprint = this.resolveFootprint();
     const hasFootprintChild = this.children.some(
       (c) => c.componentName === "Footprint"
     );
@@ -12654,8 +12656,9 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     return dimensions;
   }
   getFootprinterString() {
-    if (typeof this._parsedProps.footprint === "string") {
-      return this._parsedProps.footprint;
+    const footprint = this.resolveFootprint();
+    if (typeof footprint === "string") {
+      return footprint;
     }
     return null;
   }
@@ -12666,11 +12669,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     const { boardThickness = 0 } = this._getBoard() ?? {};
     const cadModelProp2 = this._parsedProps.cadModel;
     const cadModel = cadModelProp2 === void 0 ? this._asyncFootprintCadModel : cadModelProp2;
-    const footprint = this.getFootprinterString() ?? this._getImpliedFootprintString();
-    let footprintString;
-    if (typeof footprint === "string") {
-      footprintString = footprint;
-    }
+    const footprintString = this.getFootprinterString() ?? void 0;
     let footprintIsFootprinterString = false;
     if (footprintString) {
       footprintIsFootprinterString = !parseLibraryFootprintRef(footprintString) && !isHttpUrl(footprintString) && !isStaticAssetPath(footprintString);
@@ -12837,10 +12836,8 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     const source_component = db.source_component.get(this.source_component_id);
     if (!source_component) return;
     if (source_component.supplier_part_numbers) return;
-    let footprinterString;
-    if (this.props.footprint && typeof this.props.footprint === "string") {
-      footprinterString = this.props.footprint;
-    }
+    const footprint = this.props.footprint ?? this._getImpliedFootprintString();
+    const footprinterString = typeof footprint === "string" ? footprint : void 0;
     const supplierPartNumbersMaybePromise = this._getSupplierPartNumbers(
       partsEngine,
       source_component,
@@ -22240,7 +22237,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1288",
+  version: "0.0.1290",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -24459,6 +24456,59 @@ var Interconnect = class extends NormalComponent3 {
 import { solderjumperProps } from "@tscircuit/props";
 var SolderJumper = class extends NormalComponent3 {
   schematicDimensions = null;
+  _getPinCountFromFootprintString(footprint) {
+    const match = footprint.match(/^solderjumper([23])(?:_|$)/);
+    if (!match) return null;
+    return Number(match[1]);
+  }
+  // Used during footprint resolution before ports can be selected.
+  _getPinNumberFromBridgedPinsProp(pinName) {
+    const numericPinMatch = pinName.match(/^(?:pin)?(\d+)$/i);
+    if (numericPinMatch) return Number(numericPinMatch[1]);
+    const pinLabels = this._parsedProps.pinLabels ?? this.props.pinLabels;
+    if (Array.isArray(pinLabels)) {
+      const labelIndex = pinLabels.findIndex((label) => label === pinName);
+      return labelIndex >= 0 ? labelIndex + 1 : null;
+    }
+    if (pinLabels && typeof pinLabels === "object") {
+      for (const [pinKey, labelOrLabels] of Object.entries(pinLabels)) {
+        const labels = Array.isArray(labelOrLabels) ? labelOrLabels : [labelOrLabels];
+        if (!labels.includes(pinName)) continue;
+        const pinNumberMatch = pinKey.match(/^(?:pin)?(\d+)$/i);
+        return pinNumberMatch ? Number(pinNumberMatch[1]) : null;
+      }
+    }
+    return null;
+  }
+  _getBridgedPinNumbersForFootprint(pinCount) {
+    const props = this._parsedProps ?? this.props;
+    if (Array.isArray(props.bridgedPins) && props.bridgedPins.length > 0) {
+      return Array.from(
+        new Set(
+          props.bridgedPins.flat().map(
+            (pinName) => this._getPinNumberFromBridgedPinsProp(pinName)
+          ).filter(
+            (pinNumber) => pinNumber !== null && pinNumber >= 1 && pinNumber <= pinCount
+          )
+        )
+      ).sort((a, b) => a - b);
+    }
+    if (!props.bridged) return [];
+    return Array.from({ length: pinCount }, (_, index) => index + 1);
+  }
+  resolveFootprint() {
+    const footprint = super.resolveFootprint();
+    if (typeof footprint !== "string") return footprint;
+    const pinCount = this._getPinCountFromFootprintString(footprint);
+    if (!pinCount) return footprint;
+    if (/_bridged\d+/.test(footprint)) return footprint;
+    const bridgedPinNumbers = this._getBridgedPinNumbersForFootprint(pinCount);
+    if (bridgedPinNumbers.length === 0) return footprint;
+    return footprint.replace(
+      /^solderjumper[23]/,
+      `solderjumper${pinCount}_bridged${bridgedPinNumbers.join("")}`
+    );
+  }
   _getPinNumberFromBridgedPinName(pinName) {
     const port = this.selectOne(`port.${pinName}`, {
       type: "port"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1289",
+  "version": "0.0.1291",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",