refactor: resolve component-specific Footprinter definitions in core

lib/components/base-components/NormalComponent/NormalComponent.ts

@@ -1,4 +1,3 @@
-import { resolveFootprinterPolarity } from "./utils/resolve-footprinter-polarity"
 import { NormalComponent_doInitialSourcePinSpecificationChecks } from "./NormalComponent_doInitialSourcePinSpecificationChecks"
 import {
   getNumericPinLabels,
@@ -683,8 +682,9 @@ export class NormalComponent<
 
   // Override to choose the effective footprint without rewriting user props.
   resolveFootprint() {
+    // Footprint-driven config can discover ports before props have been parsed.
     return (
-      this._parsedProps.footprint ??
+      this._parsedProps?.footprint ??
       this.props.footprint ??
       this._getImpliedFootprintString?.()
     )
@@ -703,16 +703,7 @@ export class NormalComponent<
       if (parseLibraryFootprintRef(footprint)) return
       let fpCircuitJson: AnyCircuitElement[]
       try {
-        const resolved = resolveFootprinterPolarity({
-          footprint,
-          componentName: this.componentName,
-          name: this.name ?? this.componentName,
-          pinLabels: this._resolvePinLabels(),
-          polarized: this._parsedProps.polarized,
-        })
-        fpCircuitJson = fp
-          .string(resolved.footprint)
-          .soup() as AnyCircuitElement[]
+        fpCircuitJson = fp.string(footprint).soup() as AnyCircuitElement[]
       } catch (error) {
         this._queueInvalidFootprintPropMessage(footprint, error)
         return
@@ -1657,7 +1648,7 @@ export class NormalComponent<
       inferredInternallyConnectedPinNames,
       implicitPinNumberByHint,
     }
-    let { footprint } = this.props
+    let footprint = this.resolveFootprint()
     if (
       typeof footprint === "string" &&
       parseLibraryFootprintRef(footprint) &&

lib/components/base-components/NormalComponent/utils/resolve-footprinter-polarity.ts

@@ -1,11 +1,14 @@
 import { fp } from "@tscircuit/footprinter"
 import type { PinLabelsProp } from "@tscircuit/props"
 
+const footprinterFunctions = new Set(fp.getFootprintNames())
+
 const positiveLabels = new Set(["a", "anode", "pos", "positive"])
 const negativeLabels = new Set(["k", "c", "cathode", "neg", "negative"])
 
-/** Resolve electrical terminal identities before generating footprint artwork.
- * Numeric pad identities and footprint-local geometry remain unchanged.
+/** Select the Footprinter definition from component intent without changing props.
+ * Footprinter owns the resulting geometry and fabrication artwork. Resolved
+ * terminal identities remain available to core's electrical port initialization.
  */
 export function resolveFootprinterPolarity({
   footprint,
@@ -20,11 +23,35 @@ export function resolveFootprinterPolarity({
   pinLabels?: PinLabelsProp
   polarized?: boolean
 }) {
-  if (!["Diode", "Led", "Capacitor"].includes(componentName))
+  if (!["Diode", "Led", "Capacitor", "Chip"].includes(componentName))
     return { footprint, positivePin: 1, negativePin: 2 }
 
   const capacitor = componentName === "Capacitor"
-  const parameters = fp.string(footprint).params()
+  const definition = footprint.trim()
+  const parameters = fp.string(definition).params()
+  // Invalid definitions must retain their authored spelling for normal diagnostics.
+  if (!footprinterFunctions.has(parameters.fn)) {
+    return { footprint, positivePin: 1, negativePin: 2 }
+  }
+  const hasPolarityModifier =
+    parameters.polarized !== undefined || parameters.nonpolarized !== undefined
+
+  // A generic chip does not acquire electrical polarity from its package name.
+  // Preserve an explicitly authored modifier; otherwise request neutral artwork.
+  if (componentName === "Chip") {
+    return {
+      footprint: hasPolarityModifier
+        ? definition
+        : `${definition}_nonpolarized`,
+      positivePin: 1,
+      negativePin: 2,
+    }
+  }
+
+  // Match Footprinter's bare-size syntax, including dimensions and _metric.
+  let resolvedFootprint = /^\d{4,5}(?=$|_|x)/.test(definition)
+    ? `${capacitor ? "cap" : "diode"}${definition}`
+    : definition
   let positivePin = 1
   let negativePin = 2
   const positiveOption = capacitor ? "positivepin" : "anodepin"
@@ -38,6 +65,11 @@ export function resolveFootprinterPolarity({
     )
     const positive = aliases.some((label) => positiveLabels.has(label))
     const negative = aliases.some((label) => negativeLabels.has(label))
+    if (positive && negative) {
+      throw new Error(
+        `${name} pin${pin} has conflicting positive and negative polarity labels.`,
+      )
+    }
     return positive === negative
       ? undefined
       : positive
@@ -90,36 +122,31 @@ export function resolveFootprinterPolarity({
   }
 
   if (capacitor) {
-    if (polarized) {
-      if (
-        parameters.nonpolarized ||
+    if (
+      polarized &&
+      (parameters.nonpolarized ||
         parameters.polarized === false ||
-        parameters.polarized === "false"
-      ) {
-        throw new Error(
-          `${name} is polarized but its footprint explicitly disables polarity.`,
-        )
-      }
-      // Bare chip sizes normally select resistor geometry. Keep capacitor
-      // geometry while resolving its electrical terminal identities.
-      const capacitorFootprint = /^\d{4,5}(?=_|$)/.test(footprint)
-        ? `cap${footprint}`
-        : footprint
-      // Core already emits pin-aware fabrication polarity symbols. Leave the
-      // additional footprinter silkscreen mark opt-in: its current capacitor
-      // implementation always marks pin 1, even when positivepin is 2.
-      return {
-        footprint: `${capacitorFootprint}_positivepin${positivePin}_negativepin${negativePin}`,
-        positivePin,
-        negativePin,
-      }
+        parameters.polarized === "false")
+    ) {
+      throw new Error(
+        `${name} is polarized but its footprint explicitly disables polarity.`,
+      )
     }
-  } else if (hasPolarityLabels) {
-    return {
-      footprint: `${footprint}_anodepin${positivePin}_cathodepin${negativePin}`,
-      positivePin,
-      negativePin,
+    if (!hasPolarityModifier) {
+      resolvedFootprint += polarized ? "_polarized" : "_nonpolarized"
+    }
+  }
+
+  // Add only missing modifiers so every consumer can resolve idempotently.
+  const genericDiodePads =
+    !capacitor && parameters.fn === "smdpads" && parameters.num_pins === 2
+  if (hasPolarityLabels || genericDiodePads) {
+    if (explicitPositive === undefined) {
+      resolvedFootprint += `_${positiveOption}${positivePin}`
+    }
+    if (explicitNegative === undefined) {
+      resolvedFootprint += `_${negativeOption}${negativePin}`
     }
   }
-  return { footprint, positivePin, negativePin }
+  return { footprint: resolvedFootprint, positivePin, negativePin }
 }

lib/components/normal-components/Capacitor.ts

@@ -11,26 +11,25 @@ import { NormalComponent } from "../base-components/NormalComponent/NormalCompon
 import { isFootprinterString } from "../base-components/NormalComponent/utils/isFootprinterString"
 import { resolveFootprinterPolarity } from "../base-components/NormalComponent/utils/resolve-footprinter-polarity"
 import { Trace } from "../primitive-components/Trace/Trace"
-import { Capacitor_addPolarityFabricationSymbols } from "./Capacitor_addPolarityFabricationSymbols"
 import { Capacitor_getAutomaticMaxDecouplingTraceLength } from "./Capacitor_getAutomaticMaxDecouplingTraceLength"
 
-const CAPACITOR_CHIP_FOOTPRINTS = new Set([
-  "01005",
-  "0201",
-  "0402",
-  "0603",
-  "0805",
-  "1206",
-  "1210",
-  "2010",
-  "2512",
-])
-
 export class Capacitor extends NormalComponent<
   typeof capacitorProps,
   PolarizedPassivePorts
 > {
   _adjustSilkscreenTextAutomatically = true
+  resolveFootprint() {
+    const footprint = super.resolveFootprint()
+    if (!isFootprinterString(footprint)) return footprint
+    return resolveFootprinterPolarity({
+      footprint,
+      componentName: "Capacitor",
+      name: this.name ?? "Capacitor",
+      pinLabels: this._resolvePinLabels(),
+      polarized: this._parsedProps.polarized,
+    }).footprint
+  }
+
   get config() {
     const baseSymbolName = this.props.symbolName ?? "capacitor"
     const compactSize =
@@ -66,6 +65,7 @@ export class Capacitor extends NormalComponent<
             footprint: this.props.footprint,
             componentName: this.componentName,
             name: this.name,
+            pinLabels: this._resolvePinLabels(),
             polarized: this._parsedProps.polarized,
           })
         : { positivePin: 1, negativePin: 2 }
@@ -112,14 +112,6 @@ export class Capacitor extends NormalComponent<
     return capacitanceDisplay
   }
 
-  getFootprinterString(): string | null {
-    const baseFootprint = super.getFootprinterString()
-    if (baseFootprint && CAPACITOR_CHIP_FOOTPRINTS.has(baseFootprint)) {
-      return `cap${baseFootprint}`
-    }
-    return baseFootprint
-  }
-
   doInitialCreateNetsFromProps() {
     this._createNetsFromProps([
       this.props.decouplingFor,
@@ -146,11 +138,6 @@ export class Capacitor extends NormalComponent<
     this._createTracesFromConnectionsProp()
   }
 
-  doInitialPcbComponentSizeCalculation(): void {
-    super.doInitialPcbComponentSizeCalculation()
-    Capacitor_addPolarityFabricationSymbols(this)
-  }
-
   doInitialSourceRender() {
     const { db } = this.root!
     const { _parsedProps: props } = this

lib/components/normal-components/Chip.ts

@@ -1,3 +1,5 @@
+import { isFootprinterString } from "../base-components/NormalComponent/utils/isFootprinterString"
+import { resolveFootprinterPolarity } from "../base-components/NormalComponent/utils/resolve-footprinter-polarity"
 import { normalizeDegrees } from "@tscircuit/math-utils"
 import { chipProps, resolveManufacturerPartNumber } from "@tscircuit/props"
 import { pcb_component_invalid_layer_error } from "circuit-json"
@@ -10,6 +12,17 @@ export class Chip<PinLabels extends string = never> extends NormalComponent<
   typeof chipProps,
   PinLabels
 > {
+  resolveFootprint() {
+    const footprint = super.resolveFootprint()
+    if (!isFootprinterString(footprint)) return footprint
+    return resolveFootprinterPolarity({
+      footprint,
+      componentName: "Chip",
+      name: this.name ?? "Chip",
+      pinLabels: this._resolvePinLabels(),
+    }).footprint
+  }
+
   get config() {
     return {
       componentName: "Chip",

lib/components/normal-components/Diode.ts

@@ -15,6 +15,17 @@ export class Diode extends NormalComponent<
   typeof diodeProps,
   PolarizedPassivePorts
 > {
+  resolveFootprint() {
+    const footprint = super.resolveFootprint()
+    if (!isFootprinterString(footprint)) return footprint
+    return resolveFootprinterPolarity({
+      footprint,
+      componentName: "Diode",
+      name: this.name ?? "Diode",
+      pinLabels: this._resolvePinLabels(),
+    }).footprint
+  }
+
   get config() {
     const symbolMap: Record<string, BaseSymbolName> = {
       schottky: "schottky_diode",