@tscircuit/core 0.0.1140 → 0.0.1142

package/dist/index.js

@@ -3885,6 +3885,64 @@ var getViaDiameterDefaultsWithOverrides = (overrides, pcbStyle) => {
   };
 };
 
+// lib/components/primitive-components/Port/areAllPcbPrimitivesOverlapping.ts
+var areAllPcbPrimitivesOverlapping = (pcbPrimitives) => {
+  if (pcbPrimitives.length <= 1) return true;
+  const bounds = pcbPrimitives.map((p) => {
+    const circuitBounds = p._getPcbCircuitJsonBounds();
+    return {
+      left: circuitBounds.bounds.left,
+      right: circuitBounds.bounds.right,
+      top: circuitBounds.bounds.top,
+      bottom: circuitBounds.bounds.bottom
+    };
+  });
+  const overlaps = Array(bounds.length).fill(false).map(() => Array(bounds.length).fill(false));
+  for (let i = 0; i < bounds.length; i++) {
+    for (let j = i + 1; j < bounds.length; j++) {
+      const a = bounds[i];
+      const b = bounds[j];
+      overlaps[i][j] = overlaps[j][i] = !(a.right < b.left || a.left > b.right || a.bottom > b.top || a.top < b.bottom);
+    }
+  }
+  const visited = /* @__PURE__ */ new Set();
+  const dfs = (node) => {
+    visited.add(node);
+    for (let i = 0; i < bounds.length; i++) {
+      if (overlaps[node][i] && !visited.has(i)) {
+        dfs(i);
+      }
+    }
+  };
+  dfs(0);
+  return visited.size === bounds.length;
+};
+
+// lib/components/primitive-components/Trace/getPcbSelectorErrorForTracePort.ts
+function formatPcbPrimitiveForError(component) {
+  const portHints = component._parsedProps?.portHints ?? [];
+  const aliases = portHints.filter(Boolean);
+  if (aliases.length > 0) {
+    return `<${component.lowercaseComponentName}(${aliases.map((alias) => `.${alias}`).join(", ")}) />`;
+  }
+  return `<${component.lowercaseComponentName} />`;
+}
+function getPcbSelectorErrorForTracePort(selector, port) {
+  if (port.pcb_port_id) return null;
+  const pcbMatches = port.matchedComponents.filter((c) => c.isPcbPrimitive);
+  const parentName = port.getParentNormalComponent()?.props.name ?? port.parent?.props.name ?? "unknown";
+  const rawPinSelectors = Array.from(
+    new Set(
+      port.getNameAndAliases().filter((alias) => /^pin\d+$/.test(alias)).map((alias) => `${parentName}.${alias}`)
+    )
+  );
+  if (pcbMatches.length > 1 && !areAllPcbPrimitivesOverlapping(pcbMatches)) {
+    const suggestion = rawPinSelectors.length > 0 ? ` Use a raw pin selector like ${rawPinSelectors.map((s) => `"${s}"`).join(" or ")}.` : "";
+    return `Trace selector "${selector}" resolved to "${parentName}.${port.props.name}", but that target maps to multiple non-overlapping PCB pads: ${pcbMatches.map((c) => formatPcbPrimitiveForError(c)).join(", ")}.${suggestion}`;
+  }
+  return null;
+}
+
 // lib/components/primitive-components/Trace/Trace_doInitialPcbTraceRender.ts
 var portToObjective = (port) => {
   const portPosition = port._getGlobalPcbPositionAfterLayout();
@@ -3928,10 +3986,12 @@ function Trace_doInitialPcbTraceRender(trace) {
   }
   let allPortsFound;
   let ports;
+  let portsWithSelectors;
   try {
     const connectedPorts = trace._findConnectedPorts();
     allPortsFound = connectedPorts.allPortsFound;
     ports = connectedPorts.ports ?? [];
+    portsWithSelectors = connectedPorts.portsWithSelectors ?? [];
   } catch (error) {
     if (error instanceof TraceConnectionError) {
       db.source_trace_not_connected_error.insert({
@@ -3945,6 +4005,20 @@ function Trace_doInitialPcbTraceRender(trace) {
   }
   const portsConnectedOnPcbViaNet = [];
   if (!allPortsFound) return;
+  const pcbSelectorError = portsWithSelectors.map(
+    ({ selector, port }) => getPcbSelectorErrorForTracePort(selector, port)
+  ).find(Boolean);
+  if (pcbSelectorError) {
+    db.pcb_trace_error.insert({
+      error_type: "pcb_trace_error",
+      source_trace_id: trace.source_trace_id,
+      message: pcbSelectorError,
+      pcb_trace_id: trace.pcb_trace_id,
+      pcb_component_ids: [],
+      pcb_port_ids: ports.map((p) => p.pcb_port_id).filter(Boolean)
+    });
+    return;
+  }
   const portsWithoutMatchedPcbPrimitive = [];
   for (const port of ports) {
     if (!port._hasMatchedPcbPrimitive()) {
@@ -4368,6 +4442,20 @@ function Trace_doInitialPcbManualTraceRender(trace) {
     throw error;
   }
   if (!allPortsFound) return;
+  const pcbSelectorError = portsWithSelectors.map(
+    ({ selector, port }) => getPcbSelectorErrorForTracePort(selector, port)
+  ).find(Boolean);
+  if (pcbSelectorError) {
+    db.pcb_trace_error.insert({
+      error_type: "pcb_trace_error",
+      source_trace_id: trace.source_trace_id,
+      message: pcbSelectorError,
+      pcb_trace_id: trace.pcb_trace_id,
+      pcb_component_ids: [],
+      pcb_port_ids: ports.map((p) => p.pcb_port_id).filter(Boolean)
+    });
+    return;
+  }
   const portsWithoutMatchedPcbPrimitive = [];
   for (const port of ports) {
     if (!port._hasMatchedPcbPrimitive()) {
@@ -4491,6 +4579,18 @@ function Trace_doInitialPcbManualTraceRender(trace) {
         });
         continue;
       }
+      const pcbTargetError = getPcbSelectorErrorForTracePort(pt, resolvedPort);
+      if (pcbTargetError) {
+        db.pcb_trace_error.insert({
+          error_type: "pcb_trace_error",
+          source_trace_id: trace.source_trace_id,
+          message: pcbTargetError,
+          pcb_trace_id: trace.pcb_trace_id,
+          pcb_component_ids: [],
+          pcb_port_ids: []
+        });
+        return;
+      }
       const portPos = resolvedPort._getGlobalPcbPositionAfterLayout();
       coordinates = { x: portPos.x, y: portPos.y };
       isGlobalPosition = true;
@@ -5262,14 +5362,27 @@ var createInstanceFromReactElement = (reactElm) => {
 import "circuit-json";
 import "zod";
 
+// lib/utils/schematic/getPinNumberFromPinLabelsKey.ts
+var PIN_LABELS_KEY_RE = /^(?:pin)?(\d+)$/;
+var getPinNumberFromPinLabelsKey = (pinKey) => {
+  const match = pinKey.match(PIN_LABELS_KEY_RE);
+  if (!match) return null;
+  return Number.parseInt(match[1], 10);
+};
+
 // lib/utils/schematic/parsePinNumberFromLabelsOrThrow.ts
 var parsePinNumberFromLabelsOrThrow = (pinNumberOrLabel, pinLabels) => {
   if (typeof pinNumberOrLabel === "number") {
     return pinNumberOrLabel;
   }
+  const directPinNumber = getPinNumberFromPinLabelsKey(pinNumberOrLabel);
+  if (directPinNumber !== null) {
+    return directPinNumber;
+  }
   if (pinNumberOrLabel.startsWith("pin")) {
-    const pinNumber = Number(pinNumberOrLabel.slice(3));
-    return pinNumber;
+    throw new Error(
+      `Invalid pinLabels key "${pinNumberOrLabel}". Expected "pin\${number}" (e.g. pin1, pin2).`
+    );
   }
   if (!pinLabels) {
     throw new Error(
@@ -5279,7 +5392,13 @@ var parsePinNumberFromLabelsOrThrow = (pinNumberOrLabel, pinLabels) => {
   for (const pinNumberKey in pinLabels) {
     const aliases = Array.isArray(pinLabels[pinNumberKey]) ? pinLabels[pinNumberKey] : [pinLabels[pinNumberKey]];
     if (aliases.includes(pinNumberOrLabel)) {
-      return Number(pinNumberKey.replace("pin", ""));
+      const pinNumber = getPinNumberFromPinLabelsKey(pinNumberKey);
+      if (pinNumber === null) {
+        throw new Error(
+          `Invalid pinLabels key "${pinNumberKey}". Expected "pin\${number}" (e.g. pin1, pin2).`
+        );
+      }
+      return pinNumber;
     }
   }
   throw new Error(
@@ -8360,39 +8479,6 @@ import "schematic-symbols";
 import { applyToPoint as applyToPoint16, compose as compose4, translate as translate3 } from "transformation-matrix";
 import { z as z7 } from "zod";
 
-// lib/components/primitive-components/Port/areAllPcbPrimitivesOverlapping.ts
-var areAllPcbPrimitivesOverlapping = (pcbPrimitives) => {
-  if (pcbPrimitives.length <= 1) return true;
-  const bounds = pcbPrimitives.map((p) => {
-    const circuitBounds = p._getPcbCircuitJsonBounds();
-    return {
-      left: circuitBounds.bounds.left,
-      right: circuitBounds.bounds.right,
-      top: circuitBounds.bounds.top,
-      bottom: circuitBounds.bounds.bottom
-    };
-  });
-  const overlaps = Array(bounds.length).fill(false).map(() => Array(bounds.length).fill(false));
-  for (let i = 0; i < bounds.length; i++) {
-    for (let j = i + 1; j < bounds.length; j++) {
-      const a = bounds[i];
-      const b = bounds[j];
-      overlaps[i][j] = overlaps[j][i] = !(a.right < b.left || a.left > b.right || a.bottom > b.top || a.top < b.bottom);
-    }
-  }
-  const visited = /* @__PURE__ */ new Set();
-  const dfs = (node) => {
-    visited.add(node);
-    for (let i = 0; i < bounds.length; i++) {
-      if (overlaps[node][i] && !visited.has(i)) {
-        dfs(i);
-      }
-    }
-  };
-  dfs(0);
-  return visited.size === bounds.length;
-};
-
 // lib/components/primitive-components/Port/getCenterOfPcbPrimitives.ts
 var getCenterOfPcbPrimitives = (pcbPrimitives) => {
   if (pcbPrimitives.length === 0) {
@@ -10384,6 +10470,21 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       invalidPinLabelsMessages = messages;
     }
     super(filteredProps);
+    if (filteredProps.pinLabels && !Array.isArray(filteredProps.pinLabels)) {
+      const invalidPinKey = Object.keys(filteredProps.pinLabels).find(
+        (pinKey) => getPinNumberFromPinLabelsKey(pinKey) === null
+      );
+      if (invalidPinKey) {
+        throw new InvalidProps(this.lowercaseComponentName, this.props, {
+          _errors: [],
+          pinLabels: {
+            _errors: [
+              `Invalid pinLabels key "${invalidPinKey}". Expected "pin\${number}" (e.g. pin1, pin2).`
+            ]
+          }
+        });
+      }
+    }
     this._invalidPinLabelMessages = invalidPinLabelsMessages;
     this._addChildrenFromStringFootprint();
     this.initPorts();
@@ -10476,21 +10577,26 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     }
     const pinLabels = this._parsedProps.pinLabels;
     if (pinLabels) {
-      for (let [pinNumber, label] of Object.entries(pinLabels)) {
-        pinNumber = pinNumber.replace("pin", "");
+      for (const [pinKey, label] of Object.entries(pinLabels)) {
+        const pinNumber = getPinNumberFromPinLabelsKey(pinKey);
+        if (pinNumber === null) {
+          throw new Error(
+            `Invalid pinLabels key "${pinKey}". Expected "pin\${number}" (e.g. pin1, pin2).`
+          );
+        }
         let existingPort = portsToCreate.find(
-          (p) => p._parsedProps.pinNumber === Number(pinNumber)
+          (p) => p._parsedProps.pinNumber === pinNumber
         );
         const primaryLabel = Array.isArray(label) ? label[0] : label;
         const otherLabels = Array.isArray(label) ? label.slice(1) : [];
         if (!existingPort) {
           existingPort = new Port(
             {
-              pinNumber: parseInt(pinNumber),
+              pinNumber,
               name: primaryLabel,
               aliases: [
                 ...otherLabels,
-                ...opts.additionalAliases?.[`pin${parseInt(pinNumber)}`] ?? []
+                ...opts.additionalAliases?.[`pin${pinNumber}`] ?? []
               ]
             },
             {
@@ -11274,7 +11380,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       if (Array.isArray(pinLabels)) {
         return pinLabels.length;
       }
-      const pinNumbers = Object.keys(pinLabels).map((k) => k.startsWith("pin") ? parseInt(k.slice(3)) : parseInt(k)).filter((n) => !Number.isNaN(n));
+      const pinNumbers = Object.keys(pinLabels).map((k) => getPinNumberFromPinLabelsKey(k)).filter((n) => n !== null && !Number.isNaN(n));
       if (pinNumbers.length > 0) {
         return Math.max(...pinNumbers);
       }
@@ -11903,6 +12009,32 @@ var inflateFootprintComponent = (pcbElm, inflatorContext) => {
   return footprint;
 };
 
+// lib/components/primitive-components/Group/Subcircuit/inflators/getInflatedPcbPlacement.ts
+var getInflatedPcbPlacement = ({
+  pcbComponent,
+  sourceGroupId,
+  inflatorContext
+}) => {
+  if (!pcbComponent?.center) {
+    return { pcbX: void 0, pcbY: void 0 };
+  }
+  if (sourceGroupId) {
+    const parentPcbGroup = inflatorContext.injectionDb.pcb_group.getWhere({
+      source_group_id: sourceGroupId
+    });
+    if (parentPcbGroup?.anchor_position) {
+      return {
+        pcbX: pcbComponent.center.x - parentPcbGroup.anchor_position.x,
+        pcbY: pcbComponent.center.y - parentPcbGroup.anchor_position.y
+      };
+    }
+  }
+  return {
+    pcbX: pcbComponent.center.x,
+    pcbY: pcbComponent.center.y
+  };
+};
+
 // lib/components/primitive-components/Group/Subcircuit/inflators/inflateSourceCapacitor.ts
 function inflateSourceCapacitor(sourceElm, inflatorContext) {
   const { injectionDb, subcircuit, groupsMap } = inflatorContext;
@@ -11912,12 +12044,17 @@ function inflateSourceCapacitor(sourceElm, inflatorContext) {
   const cadElm = injectionDb.cad_component.getWhere({
     source_component_id: sourceElm.source_component_id
   });
+  const { pcbX, pcbY } = getInflatedPcbPlacement({
+    pcbComponent: pcbElm,
+    sourceGroupId: sourceElm.source_group_id,
+    inflatorContext
+  });
   const capacitor = new Capacitor({
     name: sourceElm.name,
     capacitance: sourceElm.capacitance,
     layer: pcbElm?.layer,
-    pcbX: pcbElm?.center?.x,
-    pcbY: pcbElm?.center?.y,
+    pcbX,
+    pcbY,
     pcbRotation: pcbElm?.rotation,
     doNotPlace: pcbElm?.do_not_place,
     obstructsWithinBounds: pcbElm?.obstructs_within_bounds
@@ -12150,6 +12287,11 @@ var inflateSourceChip = (sourceElm, inflatorContext) => {
     inflatorContext
   );
   const footprinterString = cadElm?.footprinter_string ?? null;
+  const { pcbX, pcbY } = getInflatedPcbPlacement({
+    pcbComponent: pcbElm,
+    sourceGroupId: sourceElm.source_group_id,
+    inflatorContext
+  });
   const chip = new Chip({
     name: sourceElm.name,
     manufacturerPartNumber: sourceElm.manufacturer_part_number,
@@ -12161,8 +12303,8 @@ var inflateSourceChip = (sourceElm, inflatorContext) => {
     schX: schematicElm?.center?.x,
     schY: schematicElm?.center?.y,
     layer: pcbElm?.layer,
-    pcbX: pcbElm?.center?.x,
-    pcbY: pcbElm?.center?.y,
+    pcbX,
+    pcbY,
     pcbRotation: pcbElm?.rotation,
     doNotPlace: pcbElm?.do_not_place,
     obstructsWithinBounds: pcbElm?.obstructs_within_bounds,
@@ -12243,11 +12385,16 @@ function inflateSourceDiode(sourceElm, inflatorContext) {
   const cadElm = injectionDb.cad_component.getWhere({
     source_component_id: sourceElm.source_component_id
   });
+  const { pcbX, pcbY } = getInflatedPcbPlacement({
+    pcbComponent: pcbElm,
+    sourceGroupId: sourceElm.source_group_id,
+    inflatorContext
+  });
   const diode = new Diode({
     name: sourceElm.name,
     layer: pcbElm?.layer,
-    pcbX: pcbElm?.center?.x,
-    pcbY: pcbElm?.center?.y,
+    pcbX,
+    pcbY,
     pcbRotation: pcbElm?.rotation,
     doNotPlace: pcbElm?.do_not_place,
     obstructsWithinBounds: pcbElm?.obstructs_within_bounds
@@ -18195,10 +18342,31 @@ var Group6 = class extends NormalComponent3 {
 
 // lib/components/primitive-components/Group/Subcircuit/inflators/inflateSourceGroup.ts
 function inflateSourceGroup(sourceGroup, inflatorContext) {
-  const { subcircuit, groupsMap } = inflatorContext;
-  const group = new Group6({
-    name: sourceGroup.name ?? `inflated_group_${sourceGroup.source_group_id}`
+  const { injectionDb, subcircuit, groupsMap } = inflatorContext;
+  const pcbGroup = injectionDb.pcb_group.getWhere({
+    source_group_id: sourceGroup.source_group_id
   });
+  const groupProps2 = {
+    name: sourceGroup.name ?? `inflated_group_${sourceGroup.source_group_id}`
+  };
+  if (pcbGroup?.position_mode === "relative_to_group_anchor" && pcbGroup.anchor_position) {
+    let baseAnchor = { x: 0, y: 0 };
+    if (sourceGroup.parent_source_group_id) {
+      const parentPcbGroup = injectionDb.pcb_group.getWhere({
+        source_group_id: sourceGroup.parent_source_group_id
+      });
+      if (parentPcbGroup?.anchor_position) {
+        baseAnchor = parentPcbGroup.anchor_position;
+      }
+    }
+    groupProps2.pcbX = pcbGroup.anchor_position.x - baseAnchor.x;
+    groupProps2.pcbY = pcbGroup.anchor_position.y - baseAnchor.y;
+  }
+  if (pcbGroup?.anchor_alignment) {
+    groupProps2.pcbAnchorAlignment = pcbGroup.anchor_alignment;
+  }
+  const group = new Group6(groupProps2);
+  group._isInflatedFromCircuitJson = true;
   group.source_group_id = sourceGroup.source_group_id;
   if (groupsMap) {
     groupsMap.set(sourceGroup.source_group_id, group);
@@ -18261,12 +18429,17 @@ function inflateSourceInductor(sourceElm, inflatorContext) {
   const cadElm = injectionDb.cad_component.getWhere({
     source_component_id: sourceElm.source_component_id
   });
+  const { pcbX, pcbY } = getInflatedPcbPlacement({
+    pcbComponent: pcbElm,
+    sourceGroupId: sourceElm.source_group_id,
+    inflatorContext
+  });
   const inductor = new Inductor({
     name: sourceElm.name,
     inductance: sourceElm.inductance,
     layer: pcbElm?.layer,
-    pcbX: pcbElm?.center?.x,
-    pcbY: pcbElm?.center?.y,
+    pcbX,
+    pcbY,
     pcbRotation: pcbElm?.rotation,
     doNotPlace: pcbElm?.do_not_place,
     obstructsWithinBounds: pcbElm?.obstructs_within_bounds
@@ -18395,11 +18568,16 @@ function inflateSourcePushButton(sourceElm, inflatorContext) {
   const cadElm = injectionDb.cad_component.getWhere({
     source_component_id: sourceElm.source_component_id
   });
+  const { pcbX, pcbY } = getInflatedPcbPlacement({
+    pcbComponent: pcbElm,
+    sourceGroupId: sourceElm.source_group_id,
+    inflatorContext
+  });
   const pushButton = new PushButton({
     name: sourceElm.name,
     layer: pcbElm?.layer,
-    pcbX: pcbElm?.center?.x,
-    pcbY: pcbElm?.center?.y,
+    pcbX,
+    pcbY,
     pcbRotation: pcbElm?.rotation,
     doNotPlace: pcbElm?.do_not_place,
     obstructsWithinBounds: pcbElm?.obstructs_within_bounds
@@ -18511,12 +18689,17 @@ function inflateSourceResistor(sourceElm, inflatorContext) {
   const cadElm = injectionDb.cad_component.getWhere({
     source_component_id: sourceElm.source_component_id
   });
+  const { pcbX, pcbY } = getInflatedPcbPlacement({
+    pcbComponent: pcbElm,
+    sourceGroupId: sourceElm.source_group_id,
+    inflatorContext
+  });
   const resistor = new Resistor({
     name: sourceElm.name,
     resistance: sourceElm.resistance,
     layer: pcbElm?.layer,
-    pcbX: pcbElm?.center?.x,
-    pcbY: pcbElm?.center?.y,
+    pcbX,
+    pcbY,
     pcbRotation: pcbElm?.rotation,
     doNotPlace: pcbElm?.do_not_place,
     obstructsWithinBounds: pcbElm?.obstructs_within_bounds
@@ -18702,12 +18885,17 @@ function inflateSourceTransistor(sourceElm, inflatorContext) {
   const cadElm = injectionDb.cad_component.getWhere({
     source_component_id: sourceElm.source_component_id
   });
+  const { pcbX, pcbY } = getInflatedPcbPlacement({
+    pcbComponent: pcbElm,
+    sourceGroupId: sourceElm.source_group_id,
+    inflatorContext
+  });
   const transistor = new Transistor({
     name: sourceElm.name,
     type: sourceElm.transistor_type,
     layer: pcbElm?.layer,
-    pcbX: pcbElm?.center?.x,
-    pcbY: pcbElm?.center?.y,
+    pcbX,
+    pcbY,
     pcbRotation: pcbElm?.rotation,
     doNotPlace: pcbElm?.do_not_place,
     obstructsWithinBounds: pcbElm?.obstructs_within_bounds
@@ -18849,7 +19037,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1139",
+  version: "0.0.1141",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -18886,7 +19074,7 @@ var package_default = {
     "@tscircuit/circuit-json-util": "^0.0.90",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.20",
-    "@tscircuit/footprinter": "^0.0.336",
+    "@tscircuit/footprinter": "^0.0.338",
     "@tscircuit/infer-cable-insertion-point": "^0.0.2",
     "@tscircuit/infgrid-ijump-astar": "^0.0.35",
     "@tscircuit/log-soup": "^1.0.2",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1140",
+  "version": "0.0.1142",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -38,7 +38,7 @@
     "@tscircuit/circuit-json-util": "^0.0.90",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.20",
-    "@tscircuit/footprinter": "^0.0.336",
+    "@tscircuit/footprinter": "^0.0.338",
     "@tscircuit/infer-cable-insertion-point": "^0.0.2",
     "@tscircuit/infgrid-ijump-astar": "^0.0.35",
     "@tscircuit/log-soup": "^1.0.2",