@tscircuit/core 0.0.97 → 0.0.99

package/dist/index.js

@@ -34,13 +34,12 @@ __export(components_exports, {
   TraceHint: () => TraceHint
 });
 
-// lib/components/primitive-components/Footprint.ts
-import { footprintProps } from "@tscircuit/props";
+// lib/components/base-components/NormalComponent.ts
+import { rotation } from "circuit-json";
+import { fp } from "footprinter";
 
-// lib/components/base-components/PrimitiveComponent.ts
-import { z } from "zod";
-import { symbols } from "schematic-symbols";
-import "react";
+// lib/fiber/create-instance-from-react-element.ts
+import ReactReconciler from "react-reconciler";
 
 // lib/components/base-components/Renderable.ts
 var orderedRenderPhases = [
@@ -133,12 +132,169 @@ var Renderable = class {
   }
 };
 
+// lib/fiber/catalogue.ts
+var catalogue = {};
+var extendCatalogue = (objects) => {
+  const altKeys = Object.fromEntries(
+    Object.entries(objects).map(([key, v]) => [key.toLowerCase(), v])
+  );
+  Object.assign(catalogue, objects);
+  Object.assign(catalogue, altKeys);
+};
+
+// lib/fiber/create-instance-from-react-element.ts
+import { identity } from "transformation-matrix";
+function prepare(object, state) {
+  const instance = object;
+  instance.__tsci = {
+    ...state
+  };
+  return object;
+}
+var hostConfig = {
+  supportsMutation: true,
+  createInstance(type, props) {
+    const target = catalogue[type];
+    if (!target) {
+      if (Object.keys(catalogue).length === 0) {
+        throw new Error(
+          "No components registered in catalogue, did you forget to import lib/register-catalogue in your test file?"
+        );
+      }
+      throw new Error(
+        `Unsupported component type (not registered in @tscircuit/core catalogue): "${type}" See CREATING_NEW_COMPONENTS.md`
+      );
+    }
+    const instance = prepare(new target(props), {});
+    return instance;
+  },
+  createTextInstance() {
+    return {};
+  },
+  appendInitialChild(parentInstance, child) {
+    parentInstance.add(child);
+  },
+  appendChild(parentInstance, child) {
+    parentInstance.add(child);
+  },
+  appendChildToContainer(container, child) {
+    container.add(child);
+  },
+  finalizeInitialChildren() {
+    return false;
+  },
+  prepareUpdate() {
+    return null;
+  },
+  shouldSetTextContent() {
+    return false;
+  },
+  getRootHostContext() {
+    return {};
+  },
+  getChildHostContext() {
+    return {};
+  },
+  prepareForCommit() {
+    return null;
+  },
+  resetAfterCommit() {
+  },
+  commitMount() {
+  },
+  commitUpdate() {
+  },
+  removeChild() {
+  },
+  clearContainer() {
+  },
+  supportsPersistence: false,
+  getPublicInstance(instance) {
+    return instance;
+  },
+  preparePortalMount(containerInfo) {
+    throw new Error("Function not implemented.");
+  },
+  scheduleTimeout(fn, delay) {
+    throw new Error("Function not implemented.");
+  },
+  cancelTimeout(id) {
+    throw new Error("Function not implemented.");
+  },
+  noTimeout: void 0,
+  isPrimaryRenderer: false,
+  getCurrentEventPriority() {
+    throw new Error("Function not implemented.");
+  },
+  getInstanceFromNode(node) {
+    throw new Error("Function not implemented.");
+  },
+  beforeActiveInstanceBlur() {
+    throw new Error("Function not implemented.");
+  },
+  afterActiveInstanceBlur() {
+    throw new Error("Function not implemented.");
+  },
+  prepareScopeUpdate: (scopeInstance, instance) => {
+    throw new Error("Function not implemented.");
+  },
+  getInstanceFromScope: (scopeInstance) => {
+    throw new Error("Function not implemented.");
+  },
+  detachDeletedInstance: (node) => {
+    throw new Error("Function not implemented.");
+  },
+  supportsHydration: false
+};
+var reconciler = ReactReconciler(hostConfig);
+var createInstanceFromReactElement = (reactElm) => {
+  const rootContainer = {
+    children: [],
+    props: {
+      name: "$root"
+    },
+    add(instance) {
+      instance.parent = this;
+      this.children.push(instance);
+    },
+    computePcbGlobalTransform() {
+      return identity();
+    }
+  };
+  const container = reconciler.createContainer(
+    // TODO Replace with store like react-three-fiber
+    // https://github.com/pmndrs/react-three-fiber/blob/a457290856f57741bf8beef4f6ff9dbf4879c0a5/packages/fiber/src/core/index.tsx#L172
+    // https://github.com/pmndrs/react-three-fiber/blob/master/packages/fiber/src/core/store.ts#L168
+    rootContainer,
+    0,
+    null,
+    false,
+    null,
+    "tsci",
+    (error) => {
+      console.log("Error in createContainer");
+      console.error(error);
+    },
+    null
+  );
+  reconciler.updateContainer(reactElm, container, null, () => {
+  });
+  const rootInstance = reconciler.getPublicRootInstance(
+    container
+  );
+  if (rootInstance) return rootInstance;
+  return rootContainer.children[0];
+};
+
 // lib/components/base-components/PrimitiveComponent.ts
+import { z } from "zod";
+import { symbols } from "schematic-symbols";
+import "react";
 import {
   applyToPoint,
   compose,
   flipY,
-  identity,
+  identity as identity2,
   rotate,
   translate
 } from "transformation-matrix";
@@ -267,7 +423,7 @@ var PrimitiveComponent = class extends Renderable {
     const manualPlacement = this.getSubcircuit()._getManualPlacementForComponent(this);
     if (manualPlacement && this.props.pcbX === void 0 && this.props.pcbY === void 0) {
       return compose(
-        this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity(),
+        this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity2(),
         compose(
           translate(manualPlacement.x, manualPlacement.y),
           rotate((props.pcbRotation ?? 0) * Math.PI / 180)
@@ -286,7 +442,7 @@ var PrimitiveComponent = class extends Renderable {
             translate(-containerCenter.x, -containerCenter.y)
           );
           return compose(
-            this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity(),
+            this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity2(),
             flipY(),
             this.computePcbPropsTransform()
           );
@@ -294,7 +450,7 @@ var PrimitiveComponent = class extends Renderable {
       }
     }
     return compose(
-      this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity(),
+      this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity2(),
       this.computePcbPropsTransform()
     );
   }
@@ -356,7 +512,7 @@ var PrimitiveComponent = class extends Renderable {
    */
   computeSchematicGlobalTransform() {
     return compose(
-      this.parent?.computeSchematicGlobalTransform?.() ?? identity(),
+      this.parent?.computeSchematicGlobalTransform?.() ?? identity2(),
       this.computeSchematicPropsTransform()
     );
   }
@@ -566,603 +722,166 @@ var PrimitiveComponent = class extends Renderable {
   }
 };
 
-// lib/components/primitive-components/Footprint.ts
-import * as kiwi from "@lume/kiwi";
-import Debug from "debug";
-var debug = Debug("tscircuit:core:footprint");
-var Footprint = class extends PrimitiveComponent {
+// lib/components/primitive-components/Net.ts
+import { z as z2 } from "zod";
+
+// lib/utils/pairs.ts
+function pairs(arr) {
+  const result = [];
+  for (let i = 0; i < arr.length - 1; i++) {
+    result.push([arr[i], arr[i + 1]]);
+  }
+  return result;
+}
+
+// lib/components/primitive-components/Net.ts
+import { autoroute } from "@tscircuit/infgrid-ijump-astar";
+var netProps = z2.object({
+  name: z2.string()
+});
+var Net = class extends PrimitiveComponent {
+  source_net_id;
   get config() {
     return {
-      componentName: "Footprint",
-      zodProps: footprintProps
+      componentName: "Net",
+      zodProps: netProps
     };
   }
+  getPortSelector() {
+    return `net.${this.props.name}`;
+  }
+  doInitialSourceRender() {
+    const { db } = this.root;
+    const { _parsedProps: props } = this;
+    const net = db.source_net.insert({
+      name: props.name,
+      member_source_group_ids: []
+    });
+    this.source_net_id = net.source_net_id;
+  }
   /**
-   * A footprint is a constrainedlayout, the db elements are adjusted according
-   * to any constraints that are defined.
+   * Get all ports connected to this net.
+   *
+   * TODO currently we're not checking for indirect connections (traces that are
+   * connected to other traces that are in turn connected to the net)
    */
-  doInitialPcbFootprintLayout() {
-    const constraints = this.children.filter(
-      (child) => child.componentName === "Constraint"
-    );
-    if (constraints.length === 0) return;
-    const { isFlipped } = this._getPcbPrimitiveFlippedHelpers();
-    const maybeFlipLeftRight = (props) => {
-      if (isFlipped) {
-        if ("left" in props && "right" in props) {
-          return {
-            ...props,
-            left: props.right,
-            right: props.left
-          };
+  getAllConnectedPorts() {
+    const allPorts = this.getSubcircuit().selectAll("port");
+    const connectedPorts = [];
+    for (const port of allPorts) {
+      const traces = port._getDirectlyConnectedTraces();
+      for (const trace of traces) {
+        if (trace._isExplicitlyConnectedToNet(this)) {
+          connectedPorts.push(port);
+          break;
         }
       }
-      return props;
-    };
-    const involvedComponents = constraints.flatMap(
-      (constraint) => constraint._getAllReferencedComponents().componentsWithSelectors
-    ).map(({ component, selector, componentSelector, edge }) => ({
-      component,
-      selector,
-      componentSelector,
-      edge,
-      bounds: component._getPcbCircuitJsonBounds()
-    }));
-    if (involvedComponents.some((c) => c.edge)) {
-      throw new Error(
-        "edge constraints not implemented yet for footprint layout, contributions welcome!"
-      );
     }
-    function getComponentDetails(selector) {
-      return involvedComponents.find(({ selector: s }) => s === selector);
-    }
-    const solver = new kiwi.Solver();
-    const kVars = {};
-    function getKVar(name) {
-      if (!(name in kVars)) {
-        kVars[name] = new kiwi.Variable(name);
-        solver.addEditVariable(kVars[name], kiwi.Strength.weak);
+    return connectedPorts;
+  }
+  /**
+   * Get all traces that are directly connected to this net, i.e. they list
+   * this net in their path, from, or to props
+   */
+  _getAllDirectlyConnectedTraces() {
+    const allTraces = this.getSubcircuit().selectAll("trace");
+    const connectedTraces = [];
+    for (const trace of allTraces) {
+      if (trace._isExplicitlyConnectedToNet(this)) {
+        connectedTraces.push(trace);
       }
-      return kVars[name];
     }
-    for (const { selector, bounds: bounds2 } of involvedComponents) {
-      const kvx = getKVar(`${selector}_x`);
-      const kvy = getKVar(`${selector}_y`);
-      solver.suggestValue(kvx, bounds2.center.x);
-      solver.suggestValue(kvy, bounds2.center.y);
+    return connectedTraces;
+  }
+  /**
+   * Add PCB Traces to connect net islands together. A net island is a set of
+   * ports that are connected to each other. If a there are multiple net islands
+   * that means that the net is not fully connected and we need to add traces
+   * such that the nets are fully connected
+   */
+  doInitialPcbRouteNetIslands() {
+    const { db } = this.root;
+    const { _parsedProps: props } = this;
+    const traces = this._getAllDirectlyConnectedTraces().filter(
+      (trace) => (trace._portsRoutedOnPcb?.length ?? 0) > 0
+    );
+    const islands = [];
+    for (const trace of traces) {
+      const tracePorts = trace._portsRoutedOnPcb;
+      const traceIsland = islands.find(
+        (island) => tracePorts.some((port) => island.ports.includes(port))
+      );
+      if (!traceIsland) {
+        islands.push({ ports: [...tracePorts], traces: [trace] });
+        continue;
+      }
+      traceIsland.traces.push(trace);
+      traceIsland.ports.push(...tracePorts);
     }
-    for (const constraint of constraints) {
-      const props = constraint._parsedProps;
-      if ("xDist" in props) {
-        const { xDist, left, right, edgeToEdge, centerToCenter } = maybeFlipLeftRight(props);
-        const leftVar = getKVar(`${left}_x`);
-        const rightVar = getKVar(`${right}_x`);
-        const leftBounds = getComponentDetails(left)?.bounds;
-        const rightBounds = getComponentDetails(right)?.bounds;
-        if (centerToCenter) {
-          const expr = new kiwi.Expression(rightVar, [-1, leftVar]);
-          solver.addConstraint(
-            new kiwi.Constraint(
-              expr,
-              kiwi.Operator.Eq,
-              props.xDist,
-              kiwi.Strength.required
-            )
-          );
-        } else if (edgeToEdge) {
-          const expr = new kiwi.Expression(
-            rightVar,
-            -rightBounds.width / 2,
-            [-1, leftVar],
-            -leftBounds.width / 2
-          );
-          solver.addConstraint(
-            new kiwi.Constraint(
-              expr,
-              kiwi.Operator.Eq,
-              props.xDist,
-              kiwi.Strength.required
-            )
-          );
-        }
-      } else if ("yDist" in props) {
-        const { yDist, top, bottom, edgeToEdge, centerToCenter } = props;
-        const topVar = getKVar(`${top}_y`);
-        const bottomVar = getKVar(`${bottom}_y`);
-        const topBounds = getComponentDetails(top)?.bounds;
-        const bottomBounds = getComponentDetails(bottom)?.bounds;
-        if (centerToCenter) {
-          const expr = new kiwi.Expression(topVar, [-1, bottomVar]);
-          solver.addConstraint(
-            new kiwi.Constraint(
-              expr,
-              kiwi.Operator.Eq,
-              props.yDist,
-              kiwi.Strength.required
-            )
-          );
-        } else if (edgeToEdge) {
-          const expr = new kiwi.Expression(
-            topVar,
-            topBounds.height / 2,
-            [-1, bottomVar],
-            -bottomBounds.height / 2
-          );
-          solver.addConstraint(
-            new kiwi.Constraint(
-              expr,
-              kiwi.Operator.Eq,
-              props.yDist,
-              kiwi.Strength.required
-            )
+    if (islands.length === 0) {
+      return;
+    }
+    const islandPairs = pairs(islands);
+    for (const [A, B] of islandPairs) {
+      const Apositions = A.ports.map(
+        (port) => port._getGlobalPcbPositionBeforeLayout()
+      );
+      const Bpositions = B.ports.map(
+        (port) => port._getGlobalPcbPositionBeforeLayout()
+      );
+      let closestDist = Infinity;
+      let closestPair = [-1, -1];
+      for (let i = 0; i < Apositions.length; i++) {
+        const Apos = Apositions[i];
+        for (let j = 0; j < Bpositions.length; j++) {
+          const Bpos = Bpositions[j];
+          const dist = Math.sqrt(
+            (Apos.x - Bpos.x) ** 2 + (Apos.y - Bpos.y) ** 2
           );
+          if (dist < closestDist) {
+            closestDist = dist;
+            closestPair = [i, j];
+          }
         }
-      } else if ("sameY" in props) {
-        const { for: selectors } = props;
-        if (selectors.length < 2) continue;
-        const vars = selectors.map((selector) => getKVar(`${selector}_y`));
-        const expr = new kiwi.Expression(...vars.slice(1));
-        solver.addConstraint(
-          new kiwi.Constraint(
-            expr,
-            kiwi.Operator.Eq,
-            vars[0],
-            kiwi.Strength.required
-          )
-        );
-      } else if ("sameX" in props) {
-        const { for: selectors } = props;
-        if (selectors.length < 2) continue;
-        const vars = selectors.map((selector) => getKVar(`${selector}_x`));
-        const expr = new kiwi.Expression(...vars.slice(1));
-        solver.addConstraint(
-          new kiwi.Constraint(
-            expr,
-            kiwi.Operator.Eq,
-            vars[0],
-            kiwi.Strength.required
-          )
-        );
       }
-    }
-    solver.updateVariables();
-    if (debug.enabled) {
-      console.log("Solution to layout constraints:");
-      console.table(
-        Object.entries(kVars).map(([key, kvar]) => ({
-          var: key,
-          val: kvar.value()
-        }))
-      );
-    }
-    const bounds = {
-      left: Infinity,
-      right: -Infinity,
-      top: -Infinity,
-      bottom: Infinity
-    };
-    for (const {
-      selector,
-      bounds: { width, height }
-    } of involvedComponents) {
-      const kvx = getKVar(`${selector}_x`);
-      const kvy = getKVar(`${selector}_y`);
-      const newLeft = kvx.value() - width / 2;
-      const newRight = kvx.value() + width / 2;
-      const newTop = kvy.value() + height / 2;
-      const newBottom = kvy.value() - height / 2;
-      bounds.left = Math.min(bounds.left, newLeft);
-      bounds.right = Math.max(bounds.right, newRight);
-      bounds.top = Math.max(bounds.top, newTop);
-      bounds.bottom = Math.min(bounds.bottom, newBottom);
-    }
-    const globalOffset = {
-      x: -(bounds.right + bounds.left) / 2,
-      y: -(bounds.top + bounds.bottom) / 2
-    };
-    const containerPos = this.getPrimitiveContainer()._getGlobalPcbPositionBeforeLayout();
-    globalOffset.x += containerPos.x;
-    globalOffset.y += containerPos.y;
-    for (const { component, selector } of involvedComponents) {
-      const kvx = getKVar(`${selector}_x`);
-      const kvy = getKVar(`${selector}_y`);
-      component._setPositionFromLayout({
-        x: kvx.value() + globalOffset.x,
-        y: kvy.value() + globalOffset.y
-      });
-    }
-  }
-};
-
-// lib/components/base-components/NormalComponent.ts
-import { z as z4 } from "zod";
-
-// lib/utils/get-relative-direction.ts
-function getRelativeDirection(pointA, pointB) {
-  const dx = pointB.x - pointA.x;
-  const dy = pointB.y - pointA.y;
-  if (Math.abs(dx) > Math.abs(dy)) {
-    return dx > 0 ? "right" : "left";
-  }
-  return dy > 0 ? "down" : "up";
-}
-
-// lib/components/primitive-components/Port.ts
-import "schematic-symbols";
-import { applyToPoint as applyToPoint2, compose as compose2, translate as translate2 } from "transformation-matrix";
-import { z as z2 } from "zod";
-var portProps = z2.object({
-  name: z2.string().optional(),
-  pinNumber: z2.number().optional(),
-  aliases: z2.array(z2.string()).optional()
-});
-var Port = class extends PrimitiveComponent {
-  source_port_id = null;
-  pcb_port_id = null;
-  schematic_port_id = null;
-  schematicSymbolPortDef = null;
-  matchedComponents;
-  facingDirection = null;
-  get config() {
-    return {
-      componentName: "Port",
-      zodProps: portProps
-    };
-  }
-  constructor(props) {
-    if (!props.name && props.pinNumber) props.name = `pin${props.pinNumber}`;
-    if (!props.name) {
-      throw new Error("Port must have a name or a pinNumber");
-    }
-    super(props);
-    this.matchedComponents = [];
-  }
-  _getGlobalPcbPositionBeforeLayout() {
-    const matchedPcbElm = this.matchedComponents.find((c) => c.isPcbPrimitive);
-    if (!matchedPcbElm) {
-      throw new Error(
-        `Port ${this} has no matched pcb component, can't get global schematic position`
+      const Aport = A.ports[closestPair[0]];
+      const Bport = B.ports[closestPair[1]];
+      const pcbElements = db.toArray().filter(
+        (elm) => elm.type === "pcb_smtpad" || elm.type === "pcb_trace" || elm.type === "pcb_plated_hole" || elm.type === "pcb_hole" || elm.type === "source_port" || elm.type === "pcb_port"
       );
-    }
-    return matchedPcbElm?._getGlobalPcbPositionBeforeLayout() ?? { x: 0, y: 0 };
-  }
-  _getPcbCircuitJsonBounds() {
-    if (!this.pcb_port_id) {
-      return super._getPcbCircuitJsonBounds();
-    }
-    const { db } = this.root;
-    const pcb_port = db.pcb_port.get(this.pcb_port_id);
-    return {
-      center: { x: pcb_port.x, y: pcb_port.y },
-      bounds: { left: 0, top: 0, right: 0, bottom: 0 },
-      width: 0,
-      height: 0
-    };
-  }
-  _getGlobalPcbPositionAfterLayout() {
-    return this._getPcbCircuitJsonBounds().center;
-  }
-  _getGlobalSchematicPositionBeforeLayout() {
-    if (!this.schematicSymbolPortDef) {
-      return applyToPoint2(this.parent.computeSchematicGlobalTransform(), {
-        x: 0,
-        y: 0
-      });
-    }
-    const symbol = this.parent?.getSchematicSymbol();
-    if (!symbol) {
-      console.warn(`Could not find parent symbol for ${this}`);
-      return { x: 0, y: 0 };
-    }
-    const transform = compose2(
-      this.parent.computeSchematicGlobalTransform(),
-      translate2(-symbol.center.x, -symbol.center.y)
-    );
-    return applyToPoint2(transform, this.schematicSymbolPortDef);
-  }
-  /**
-   * Smtpads and platedholes call this method to register themselves as a match
-   * for this port. All the matching is done by primitives other than the Port,
-   * but everyone registers themselves as a match with their Port.
-   */
-  registerMatch(component) {
-    this.matchedComponents.push(component);
-  }
-  getNameAndAliases() {
-    const { _parsedProps: props } = this;
-    return Array.from(
-      /* @__PURE__ */ new Set([
-        ...props.aliases ?? [],
-        props.name,
-        ...typeof props.pinNumber === "number" ? [`pin${props.pinNumber}`, props.pinNumber.toString()] : [],
-        ...this.externallyAddedAliases
-      ])
-    );
-  }
-  isMatchingPort(port) {
-    return this.isMatchingAnyOf(port.getNameAndAliases());
-  }
-  getPortSelector() {
-    return `.${this.parent?.props.name} > port.${this.props.name}`;
-  }
-  getAvailablePcbLayers() {
-    return Array.from(
-      new Set(this.matchedComponents.flatMap((c) => c.getAvailablePcbLayers()))
-    );
-  }
-  /**
-   * Return traces that are explicitly connected to this port (not via a net)
-   */
-  _getDirectlyConnectedTraces() {
-    const allSubcircuitTraces = this.getSubcircuit().selectAll(
-      "trace"
-    );
-    const connectedTraces = allSubcircuitTraces.filter(
-      (trace) => trace._isExplicitlyConnectedToPort(this)
-    );
-    return connectedTraces;
-  }
-  doInitialSourceRender() {
-    const { db } = this.root;
-    const { _parsedProps: props } = this;
-    const port_hints = this.getNameAndAliases();
-    const source_port = db.source_port.insert({
-      name: props.name,
-      pin_number: props.pinNumber,
-      port_hints,
-      source_component_id: this.parent?.source_component_id
-    });
-    this.source_port_id = source_port.source_port_id;
-  }
-  doInitialSourceParentAttachment() {
-    const { db } = this.root;
-    if (!this.parent?.source_component_id) {
-      throw new Error(
-        `${this.getString()} has no parent source component (parent: ${this.parent?.getString()})`
-      );
-    }
-    db.source_port.update(this.source_port_id, {
-      source_component_id: this.parent?.source_component_id
-    });
-    this.source_component_id = this.parent?.source_component_id;
-  }
-  doInitialPcbPortRender() {
-    const { db } = this.root;
-    const { matchedComponents } = this;
-    if (!this.parent?.pcb_component_id) {
-      throw new Error(
-        `${this.getString()} has no parent pcb component, cannot render pcb_port (parent: ${this.parent?.getString()})`
-      );
-    }
-    const pcbMatches = matchedComponents.filter((c) => c.isPcbPrimitive);
-    if (pcbMatches.length === 0) return;
-    if (pcbMatches.length > 1) {
-      throw new Error(
-        `${this.getString()} has multiple pcb matches, unclear how to place pcb_port: ${pcbMatches.map((c) => c.getString()).join(", ")}`
-      );
-    }
-    const pcbMatch = pcbMatches[0];
-    if ("_getPcbCircuitJsonBounds" in pcbMatch) {
-      const pcb_port = db.pcb_port.insert({
-        pcb_component_id: this.parent?.pcb_component_id,
-        layers: this.getAvailablePcbLayers(),
-        ...pcbMatch._getPcbCircuitJsonBounds().center,
-        source_port_id: this.source_port_id
-      });
-      this.pcb_port_id = pcb_port.pcb_port_id;
-    } else {
-      throw new Error(
-        `${pcbMatch.getString()} does not have a _getGlobalPcbPositionBeforeLayout method (needed for pcb_port placement)`
-      );
-    }
-  }
-  doInitialSchematicPortRender() {
-    const { db } = this.root;
-    const { _parsedProps: props } = this;
-    const container = this.getPrimitiveContainer();
-    if (!container) return;
-    let center = this._getGlobalSchematicPositionBeforeLayout();
-    if ("schematicDimensions" in container && props.pinNumber !== void 0) {
-      const chipDims = container.schematicDimensions;
-      center = chipDims.getPortPositionByPinNumber(props.pinNumber);
-    }
-    const containerCenter = container._getGlobalSchematicPositionBeforeLayout();
-    this.facingDirection = getRelativeDirection(containerCenter, center);
-    const schematic_port = db.schematic_port.insert({
-      schematic_component_id: this.parent?.schematic_component_id,
-      center,
-      source_port_id: this.source_port_id,
-      facing_direction: this.facingDirection
-    });
-    this.schematic_port_id = schematic_port.schematic_port_id;
-  }
-  _setPositionFromLayout(newCenter) {
-    const { db } = this.root;
-    if (!this.pcb_port_id) return;
-    db.pcb_port.update(this.pcb_port_id, {
-      x: newCenter.x,
-      y: newCenter.y
-    });
-  }
-  _hasMatchedPcbPrimitive() {
-    return this.matchedComponents.some((c) => c.isPcbPrimitive);
-  }
-};
-
-// lib/components/base-components/NormalComponent.ts
-import { symbols as symbols2 } from "schematic-symbols";
-import { fp } from "footprinter";
-import {
-  isValidElement as isReactElement2,
-  isValidElement
-} from "react";
-
-// lib/fiber/create-instance-from-react-element.ts
-import ReactReconciler from "react-reconciler";
-
-// lib/fiber/catalogue.ts
-var catalogue = {};
-var extendCatalogue = (objects) => {
-  const altKeys = Object.fromEntries(
-    Object.entries(objects).map(([key, v]) => [key.toLowerCase(), v])
-  );
-  Object.assign(catalogue, objects);
-  Object.assign(catalogue, altKeys);
-};
-
-// lib/fiber/create-instance-from-react-element.ts
-import { identity as identity2 } from "transformation-matrix";
-function prepare(object, state) {
-  const instance = object;
-  instance.__tsci = {
-    ...state
-  };
-  return object;
-}
-var hostConfig = {
-  supportsMutation: true,
-  createInstance(type, props) {
-    const target = catalogue[type];
-    if (!target) {
-      if (Object.keys(catalogue).length === 0) {
-        throw new Error(
-          "No components registered in catalogue, did you forget to import lib/register-catalogue in your test file?"
-        );
-      }
-      throw new Error(
-        `Unsupported component type (not registered in @tscircuit/core catalogue): "${type}" See CREATING_NEW_COMPONENTS.md`
+      const { solution } = autoroute(
+        pcbElements.concat([
+          {
+            type: "source_trace",
+            source_trace_id: "__net_trace_tmp",
+            connected_source_port_ids: [
+              Aport.source_port_id,
+              Bport.source_port_id
+            ]
+          }
+        ])
+        // Remove as any when autorouting-dataset has been updated
       );
-    }
-    const instance = prepare(new target(props), {});
-    return instance;
-  },
-  createTextInstance() {
-    return {};
-  },
-  appendInitialChild(parentInstance, child) {
-    parentInstance.add(child);
-  },
-  appendChild(parentInstance, child) {
-    parentInstance.add(child);
-  },
-  appendChildToContainer(container, child) {
-    container.add(child);
-  },
-  finalizeInitialChildren() {
-    return false;
-  },
-  prepareUpdate() {
-    return null;
-  },
-  shouldSetTextContent() {
-    return false;
-  },
-  getRootHostContext() {
-    return {};
-  },
-  getChildHostContext() {
-    return {};
-  },
-  prepareForCommit() {
-    return null;
-  },
-  resetAfterCommit() {
-  },
-  commitMount() {
-  },
-  commitUpdate() {
-  },
-  removeChild() {
-  },
-  clearContainer() {
-  },
-  supportsPersistence: false,
-  getPublicInstance(instance) {
-    return instance;
-  },
-  preparePortalMount(containerInfo) {
-    throw new Error("Function not implemented.");
-  },
-  scheduleTimeout(fn, delay) {
-    throw new Error("Function not implemented.");
-  },
-  cancelTimeout(id) {
-    throw new Error("Function not implemented.");
-  },
-  noTimeout: void 0,
-  isPrimaryRenderer: false,
-  getCurrentEventPriority() {
-    throw new Error("Function not implemented.");
-  },
-  getInstanceFromNode(node) {
-    throw new Error("Function not implemented.");
-  },
-  beforeActiveInstanceBlur() {
-    throw new Error("Function not implemented.");
-  },
-  afterActiveInstanceBlur() {
-    throw new Error("Function not implemented.");
-  },
-  prepareScopeUpdate: (scopeInstance, instance) => {
-    throw new Error("Function not implemented.");
-  },
-  getInstanceFromScope: (scopeInstance) => {
-    throw new Error("Function not implemented.");
-  },
-  detachDeletedInstance: (node) => {
-    throw new Error("Function not implemented.");
-  },
-  supportsHydration: false
-};
-var reconciler = ReactReconciler(hostConfig);
-var createInstanceFromReactElement = (reactElm) => {
-  const rootContainer = {
-    children: [],
-    props: {
-      name: "$root"
-    },
-    add(instance) {
-      instance.parent = this;
-      this.children.push(instance);
-    },
-    computePcbGlobalTransform() {
-      return identity2();
-    }
-  };
-  const container = reconciler.createContainer(
-    // TODO Replace with store like react-three-fiber
-    // https://github.com/pmndrs/react-three-fiber/blob/a457290856f57741bf8beef4f6ff9dbf4879c0a5/packages/fiber/src/core/index.tsx#L172
-    // https://github.com/pmndrs/react-three-fiber/blob/master/packages/fiber/src/core/store.ts#L168
-    rootContainer,
-    0,
-    null,
-    false,
-    null,
-    "tsci",
-    (error) => {
-      console.log("Error in createContainer");
-      console.error(error);
-    },
-    null
-  );
-  reconciler.updateContainer(reactElm, container, null, () => {
-  });
-  const rootInstance = reconciler.getPublicRootInstance(
-    container
-  );
-  if (rootInstance) return rootInstance;
-  return rootContainer.children[0];
+      const trace = solution[0];
+      if (!trace) {
+        this.renderError("Failed to route net islands");
+        return;
+      }
+      db.pcb_trace.insert(trace);
+    }
+  }
 };
 
-// lib/utils/getPortFromHints.ts
-function getPortFromHints(hints) {
-  const pinNumber = hints.find((p) => /^(pin)?\d+$/.test(p));
-  if (!pinNumber) return null;
-  return new Port({
-    pinNumber: Number.parseInt(pinNumber.replace(/^pin/, "")),
-    aliases: hints.filter((p) => p !== pinNumber)
-  });
-}
+// lib/utils/components/createNetsFromProps.ts
+var createNetsFromProps = (component, props) => {
+  for (const prop of props) {
+    if (typeof prop === "string" && prop.startsWith("net.")) {
+      if (!component.getSubcircuit().selectOne(prop)) {
+        component.getSubcircuit().add(new Net({ name: prop.split("net.")[1] }));
+      }
+    }
+  }
+};
 
 // lib/components/primitive-components/SmtPad.ts
 import { smtPadProps } from "@tscircuit/props";
@@ -1301,7 +1020,7 @@ var SmtPad = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/SilkscreenPath.ts
 import { silkscreenPathProps } from "@tscircuit/props";
-import { applyToPoint as applyToPoint4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint3 } from "transformation-matrix";
 var SilkscreenPath = class extends PrimitiveComponent {
   pcb_silkscreen_path_id = null;
   get config() {
@@ -1324,7 +1043,7 @@ var SilkscreenPath = class extends PrimitiveComponent {
       pcb_component_id: this.parent?.pcb_component_id,
       layer,
       route: props.route.map((p) => {
-        const transformedPosition = applyToPoint4(transform, {
+        const transformedPosition = applyToPoint3(transform, {
           x: p.x,
           y: p.y
         });
@@ -1554,208 +1273,485 @@ var createComponentsFromSoup = (soup) => {
       );
     }
   }
-  return components;
+  return components;
+};
+
+// lib/utils/get-bounds-of-pcb-components.ts
+function getBoundsOfPcbComponents(components) {
+  let minX = Infinity;
+  let minY = Infinity;
+  let maxX = -Infinity;
+  let maxY = -Infinity;
+  for (const child of components) {
+    if (child.isPcbPrimitive) {
+      const { x, y } = child._getGlobalPcbPositionBeforeLayout();
+      const { width: width2, height: height2 } = child.getPcbSize();
+      minX = Math.min(minX, x - width2 / 2);
+      minY = Math.min(minY, y - height2 / 2);
+      maxX = Math.max(maxX, x + width2 / 2);
+      maxY = Math.max(maxY, y + height2 / 2);
+    } else if (child.componentName === "Footprint") {
+      const childBounds = getBoundsOfPcbComponents(child.children);
+      minX = Math.min(minX, childBounds.minX);
+      minY = Math.min(minY, childBounds.minY);
+      maxX = Math.max(maxX, childBounds.maxX);
+      maxY = Math.max(maxY, childBounds.maxY);
+    }
+  }
+  let width = maxX - minX;
+  let height = maxY - minY;
+  if (width < 0) width = 0;
+  if (height < 0) height = 0;
+  return {
+    minX,
+    minY,
+    maxX,
+    maxY,
+    width,
+    height
+  };
+}
+
+// lib/utils/get-relative-direction.ts
+function getRelativeDirection(pointA, pointB) {
+  const dx = pointB.x - pointA.x;
+  const dy = pointB.y - pointA.y;
+  if (Math.abs(dx) > Math.abs(dy)) {
+    return dx > 0 ? "right" : "left";
+  }
+  return dy > 0 ? "down" : "up";
+}
+
+// lib/components/primitive-components/Port.ts
+import "schematic-symbols";
+import { applyToPoint as applyToPoint4, compose as compose3, translate as translate3 } from "transformation-matrix";
+import { z as z3 } from "zod";
+var portProps = z3.object({
+  name: z3.string().optional(),
+  pinNumber: z3.number().optional(),
+  aliases: z3.array(z3.string()).optional()
+});
+var Port = class extends PrimitiveComponent {
+  source_port_id = null;
+  pcb_port_id = null;
+  schematic_port_id = null;
+  schematicSymbolPortDef = null;
+  matchedComponents;
+  facingDirection = null;
+  get config() {
+    return {
+      componentName: "Port",
+      zodProps: portProps
+    };
+  }
+  constructor(props) {
+    if (!props.name && props.pinNumber) props.name = `pin${props.pinNumber}`;
+    if (!props.name) {
+      throw new Error("Port must have a name or a pinNumber");
+    }
+    super(props);
+    this.matchedComponents = [];
+  }
+  _getGlobalPcbPositionBeforeLayout() {
+    const matchedPcbElm = this.matchedComponents.find((c) => c.isPcbPrimitive);
+    if (!matchedPcbElm) {
+      throw new Error(
+        `Port ${this} has no matched pcb component, can't get global schematic position`
+      );
+    }
+    return matchedPcbElm?._getGlobalPcbPositionBeforeLayout() ?? { x: 0, y: 0 };
+  }
+  _getPcbCircuitJsonBounds() {
+    if (!this.pcb_port_id) {
+      return super._getPcbCircuitJsonBounds();
+    }
+    const { db } = this.root;
+    const pcb_port = db.pcb_port.get(this.pcb_port_id);
+    return {
+      center: { x: pcb_port.x, y: pcb_port.y },
+      bounds: { left: 0, top: 0, right: 0, bottom: 0 },
+      width: 0,
+      height: 0
+    };
+  }
+  _getGlobalPcbPositionAfterLayout() {
+    return this._getPcbCircuitJsonBounds().center;
+  }
+  _getGlobalSchematicPositionBeforeLayout() {
+    if (!this.schematicSymbolPortDef) {
+      return applyToPoint4(this.parent.computeSchematicGlobalTransform(), {
+        x: 0,
+        y: 0
+      });
+    }
+    const symbol = this.parent?.getSchematicSymbol();
+    if (!symbol) {
+      console.warn(`Could not find parent symbol for ${this}`);
+      return { x: 0, y: 0 };
+    }
+    const transform = compose3(
+      this.parent.computeSchematicGlobalTransform(),
+      translate3(-symbol.center.x, -symbol.center.y)
+    );
+    return applyToPoint4(transform, this.schematicSymbolPortDef);
+  }
+  /**
+   * Smtpads and platedholes call this method to register themselves as a match
+   * for this port. All the matching is done by primitives other than the Port,
+   * but everyone registers themselves as a match with their Port.
+   */
+  registerMatch(component) {
+    this.matchedComponents.push(component);
+  }
+  getNameAndAliases() {
+    const { _parsedProps: props } = this;
+    return Array.from(
+      /* @__PURE__ */ new Set([
+        ...props.aliases ?? [],
+        props.name,
+        ...typeof props.pinNumber === "number" ? [`pin${props.pinNumber}`, props.pinNumber.toString()] : [],
+        ...this.externallyAddedAliases
+      ])
+    );
+  }
+  isMatchingPort(port) {
+    return this.isMatchingAnyOf(port.getNameAndAliases());
+  }
+  getPortSelector() {
+    return `.${this.parent?.props.name} > port.${this.props.name}`;
+  }
+  getAvailablePcbLayers() {
+    return Array.from(
+      new Set(this.matchedComponents.flatMap((c) => c.getAvailablePcbLayers()))
+    );
+  }
+  /**
+   * Return traces that are explicitly connected to this port (not via a net)
+   */
+  _getDirectlyConnectedTraces() {
+    const allSubcircuitTraces = this.getSubcircuit().selectAll(
+      "trace"
+    );
+    const connectedTraces = allSubcircuitTraces.filter(
+      (trace) => trace._isExplicitlyConnectedToPort(this)
+    );
+    return connectedTraces;
+  }
+  doInitialSourceRender() {
+    const { db } = this.root;
+    const { _parsedProps: props } = this;
+    const port_hints = this.getNameAndAliases();
+    const source_port = db.source_port.insert({
+      name: props.name,
+      pin_number: props.pinNumber,
+      port_hints,
+      source_component_id: this.parent?.source_component_id
+    });
+    this.source_port_id = source_port.source_port_id;
+  }
+  doInitialSourceParentAttachment() {
+    const { db } = this.root;
+    if (!this.parent?.source_component_id) {
+      throw new Error(
+        `${this.getString()} has no parent source component (parent: ${this.parent?.getString()})`
+      );
+    }
+    db.source_port.update(this.source_port_id, {
+      source_component_id: this.parent?.source_component_id
+    });
+    this.source_component_id = this.parent?.source_component_id;
+  }
+  doInitialPcbPortRender() {
+    const { db } = this.root;
+    const { matchedComponents } = this;
+    if (!this.parent?.pcb_component_id) {
+      throw new Error(
+        `${this.getString()} has no parent pcb component, cannot render pcb_port (parent: ${this.parent?.getString()})`
+      );
+    }
+    const pcbMatches = matchedComponents.filter((c) => c.isPcbPrimitive);
+    if (pcbMatches.length === 0) return;
+    if (pcbMatches.length > 1) {
+      throw new Error(
+        `${this.getString()} has multiple pcb matches, unclear how to place pcb_port: ${pcbMatches.map((c) => c.getString()).join(", ")}`
+      );
+    }
+    const pcbMatch = pcbMatches[0];
+    if ("_getPcbCircuitJsonBounds" in pcbMatch) {
+      const pcb_port = db.pcb_port.insert({
+        pcb_component_id: this.parent?.pcb_component_id,
+        layers: this.getAvailablePcbLayers(),
+        ...pcbMatch._getPcbCircuitJsonBounds().center,
+        source_port_id: this.source_port_id
+      });
+      this.pcb_port_id = pcb_port.pcb_port_id;
+    } else {
+      throw new Error(
+        `${pcbMatch.getString()} does not have a _getGlobalPcbPositionBeforeLayout method (needed for pcb_port placement)`
+      );
+    }
+  }
+  doInitialSchematicPortRender() {
+    const { db } = this.root;
+    const { _parsedProps: props } = this;
+    const container = this.getPrimitiveContainer();
+    if (!container) return;
+    let center = this._getGlobalSchematicPositionBeforeLayout();
+    if ("schematicDimensions" in container && props.pinNumber !== void 0) {
+      const chipDims = container.schematicDimensions;
+      center = chipDims.getPortPositionByPinNumber(props.pinNumber);
+    }
+    const containerCenter = container._getGlobalSchematicPositionBeforeLayout();
+    this.facingDirection = getRelativeDirection(containerCenter, center);
+    const schematic_port = db.schematic_port.insert({
+      schematic_component_id: this.parent?.schematic_component_id,
+      center,
+      source_port_id: this.source_port_id,
+      facing_direction: this.facingDirection
+    });
+    this.schematic_port_id = schematic_port.schematic_port_id;
+  }
+  _setPositionFromLayout(newCenter) {
+    const { db } = this.root;
+    if (!this.pcb_port_id) return;
+    db.pcb_port.update(this.pcb_port_id, {
+      x: newCenter.x,
+      y: newCenter.y
+    });
+  }
+  _hasMatchedPcbPrimitive() {
+    return this.matchedComponents.some((c) => c.isPcbPrimitive);
+  }
 };
 
-// lib/components/primitive-components/Net.ts
-import { z as z3 } from "zod";
-
-// lib/utils/pairs.ts
-function pairs(arr) {
-  const result = [];
-  for (let i = 0; i < arr.length - 1; i++) {
-    result.push([arr[i], arr[i + 1]]);
-  }
-  return result;
+// lib/utils/getPortFromHints.ts
+function getPortFromHints(hints) {
+  const pinNumber = hints.find((p) => /^(pin)?\d+$/.test(p));
+  if (!pinNumber) return null;
+  return new Port({
+    pinNumber: Number.parseInt(pinNumber.replace(/^pin/, "")),
+    aliases: hints.filter((p) => p !== pinNumber)
+  });
 }
 
-// lib/components/primitive-components/Net.ts
-import { autoroute } from "@tscircuit/infgrid-ijump-astar";
-var netProps = z3.object({
-  name: z3.string()
-});
-var Net = class extends PrimitiveComponent {
-  source_net_id;
+// lib/components/base-components/NormalComponent.ts
+import {
+  isValidElement as isReactElement2,
+  isValidElement
+} from "react";
+import { symbols as symbols2 } from "schematic-symbols";
+import { z as z4 } from "zod";
+
+// lib/components/primitive-components/Footprint.ts
+import { footprintProps } from "@tscircuit/props";
+import * as kiwi from "@lume/kiwi";
+import Debug from "debug";
+var debug = Debug("tscircuit:core:footprint");
+var Footprint = class extends PrimitiveComponent {
   get config() {
     return {
-      componentName: "Net",
-      zodProps: netProps
+      componentName: "Footprint",
+      zodProps: footprintProps
     };
   }
-  getPortSelector() {
-    return `net.${this.props.name}`;
-  }
-  doInitialSourceRender() {
-    const { db } = this.root;
-    const { _parsedProps: props } = this;
-    const net = db.source_net.insert({
-      name: props.name,
-      member_source_group_ids: []
-    });
-    this.source_net_id = net.source_net_id;
-  }
   /**
-   * Get all ports connected to this net.
-   *
-   * TODO currently we're not checking for indirect connections (traces that are
-   * connected to other traces that are in turn connected to the net)
+   * A footprint is a constrainedlayout, the db elements are adjusted according
+   * to any constraints that are defined.
    */
-  getAllConnectedPorts() {
-    const allPorts = this.getSubcircuit().selectAll("port");
-    const connectedPorts = [];
-    for (const port of allPorts) {
-      const traces = port._getDirectlyConnectedTraces();
-      for (const trace of traces) {
-        if (trace._isExplicitlyConnectedToNet(this)) {
-          connectedPorts.push(port);
-          break;
+  doInitialPcbFootprintLayout() {
+    const constraints = this.children.filter(
+      (child) => child.componentName === "Constraint"
+    );
+    if (constraints.length === 0) return;
+    const { isFlipped } = this._getPcbPrimitiveFlippedHelpers();
+    const maybeFlipLeftRight = (props) => {
+      if (isFlipped) {
+        if ("left" in props && "right" in props) {
+          return {
+            ...props,
+            left: props.right,
+            right: props.left
+          };
         }
       }
+      return props;
+    };
+    const involvedComponents = constraints.flatMap(
+      (constraint) => constraint._getAllReferencedComponents().componentsWithSelectors
+    ).map(({ component, selector, componentSelector, edge }) => ({
+      component,
+      selector,
+      componentSelector,
+      edge,
+      bounds: component._getPcbCircuitJsonBounds()
+    }));
+    if (involvedComponents.some((c) => c.edge)) {
+      throw new Error(
+        "edge constraints not implemented yet for footprint layout, contributions welcome!"
+      );
     }
-    return connectedPorts;
-  }
-  /**
-   * Get all traces that are directly connected to this net, i.e. they list
-   * this net in their path, from, or to props
-   */
-  _getAllDirectlyConnectedTraces() {
-    const allTraces = this.getSubcircuit().selectAll("trace");
-    const connectedTraces = [];
-    for (const trace of allTraces) {
-      if (trace._isExplicitlyConnectedToNet(this)) {
-        connectedTraces.push(trace);
-      }
+    function getComponentDetails(selector) {
+      return involvedComponents.find(({ selector: s }) => s === selector);
     }
-    return connectedTraces;
-  }
-  /**
-   * Add PCB Traces to connect net islands together. A net island is a set of
-   * ports that are connected to each other. If a there are multiple net islands
-   * that means that the net is not fully connected and we need to add traces
-   * such that the nets are fully connected
-   */
-  doInitialPcbRouteNetIslands() {
-    const { db } = this.root;
-    const { _parsedProps: props } = this;
-    const traces = this._getAllDirectlyConnectedTraces().filter(
-      (trace) => (trace._portsRoutedOnPcb?.length ?? 0) > 0
-    );
-    const islands = [];
-    for (const trace of traces) {
-      const tracePorts = trace._portsRoutedOnPcb;
-      const traceIsland = islands.find(
-        (island) => tracePorts.some((port) => island.ports.includes(port))
-      );
-      if (!traceIsland) {
-        islands.push({ ports: [...tracePorts], traces: [trace] });
-        continue;
+    const solver = new kiwi.Solver();
+    const kVars = {};
+    function getKVar(name) {
+      if (!(name in kVars)) {
+        kVars[name] = new kiwi.Variable(name);
+        solver.addEditVariable(kVars[name], kiwi.Strength.weak);
       }
-      traceIsland.traces.push(trace);
-      traceIsland.ports.push(...tracePorts);
+      return kVars[name];
     }
-    if (islands.length === 0) {
-      return;
+    for (const { selector, bounds: bounds2 } of involvedComponents) {
+      const kvx = getKVar(`${selector}_x`);
+      const kvy = getKVar(`${selector}_y`);
+      solver.suggestValue(kvx, bounds2.center.x);
+      solver.suggestValue(kvy, bounds2.center.y);
     }
-    const islandPairs = pairs(islands);
-    for (const [A, B] of islandPairs) {
-      const Apositions = A.ports.map(
-        (port) => port._getGlobalPcbPositionBeforeLayout()
-      );
-      const Bpositions = B.ports.map(
-        (port) => port._getGlobalPcbPositionBeforeLayout()
-      );
-      let closestDist = Infinity;
-      let closestPair = [-1, -1];
-      for (let i = 0; i < Apositions.length; i++) {
-        const Apos = Apositions[i];
-        for (let j = 0; j < Bpositions.length; j++) {
-          const Bpos = Bpositions[j];
-          const dist = Math.sqrt(
-            (Apos.x - Bpos.x) ** 2 + (Apos.y - Bpos.y) ** 2
+    for (const constraint of constraints) {
+      const props = constraint._parsedProps;
+      if ("xDist" in props) {
+        const { xDist, left, right, edgeToEdge, centerToCenter } = maybeFlipLeftRight(props);
+        const leftVar = getKVar(`${left}_x`);
+        const rightVar = getKVar(`${right}_x`);
+        const leftBounds = getComponentDetails(left)?.bounds;
+        const rightBounds = getComponentDetails(right)?.bounds;
+        if (centerToCenter) {
+          const expr = new kiwi.Expression(rightVar, [-1, leftVar]);
+          solver.addConstraint(
+            new kiwi.Constraint(
+              expr,
+              kiwi.Operator.Eq,
+              props.xDist,
+              kiwi.Strength.required
+            )
+          );
+        } else if (edgeToEdge) {
+          const expr = new kiwi.Expression(
+            rightVar,
+            -rightBounds.width / 2,
+            [-1, leftVar],
+            -leftBounds.width / 2
+          );
+          solver.addConstraint(
+            new kiwi.Constraint(
+              expr,
+              kiwi.Operator.Eq,
+              props.xDist,
+              kiwi.Strength.required
+            )
+          );
+        }
+      } else if ("yDist" in props) {
+        const { yDist, top, bottom, edgeToEdge, centerToCenter } = props;
+        const topVar = getKVar(`${top}_y`);
+        const bottomVar = getKVar(`${bottom}_y`);
+        const topBounds = getComponentDetails(top)?.bounds;
+        const bottomBounds = getComponentDetails(bottom)?.bounds;
+        if (centerToCenter) {
+          const expr = new kiwi.Expression(topVar, [-1, bottomVar]);
+          solver.addConstraint(
+            new kiwi.Constraint(
+              expr,
+              kiwi.Operator.Eq,
+              props.yDist,
+              kiwi.Strength.required
+            )
+          );
+        } else if (edgeToEdge) {
+          const expr = new kiwi.Expression(
+            topVar,
+            topBounds.height / 2,
+            [-1, bottomVar],
+            -bottomBounds.height / 2
+          );
+          solver.addConstraint(
+            new kiwi.Constraint(
+              expr,
+              kiwi.Operator.Eq,
+              props.yDist,
+              kiwi.Strength.required
+            )
           );
-          if (dist < closestDist) {
-            closestDist = dist;
-            closestPair = [i, j];
-          }
         }
+      } else if ("sameY" in props) {
+        const { for: selectors } = props;
+        if (selectors.length < 2) continue;
+        const vars = selectors.map((selector) => getKVar(`${selector}_y`));
+        const expr = new kiwi.Expression(...vars.slice(1));
+        solver.addConstraint(
+          new kiwi.Constraint(
+            expr,
+            kiwi.Operator.Eq,
+            vars[0],
+            kiwi.Strength.required
+          )
+        );
+      } else if ("sameX" in props) {
+        const { for: selectors } = props;
+        if (selectors.length < 2) continue;
+        const vars = selectors.map((selector) => getKVar(`${selector}_x`));
+        const expr = new kiwi.Expression(...vars.slice(1));
+        solver.addConstraint(
+          new kiwi.Constraint(
+            expr,
+            kiwi.Operator.Eq,
+            vars[0],
+            kiwi.Strength.required
+          )
+        );
       }
-      const Aport = A.ports[closestPair[0]];
-      const Bport = B.ports[closestPair[1]];
-      const pcbElements = db.toArray().filter(
-        (elm) => elm.type === "pcb_smtpad" || elm.type === "pcb_trace" || elm.type === "pcb_plated_hole" || elm.type === "pcb_hole" || elm.type === "source_port" || elm.type === "pcb_port"
-      );
-      const { solution } = autoroute(
-        pcbElements.concat([
-          {
-            type: "source_trace",
-            source_trace_id: "__net_trace_tmp",
-            connected_source_port_ids: [
-              Aport.source_port_id,
-              Bport.source_port_id
-            ]
-          }
-        ])
-        // Remove as any when autorouting-dataset has been updated
+    }
+    solver.updateVariables();
+    if (debug.enabled) {
+      console.log("Solution to layout constraints:");
+      console.table(
+        Object.entries(kVars).map(([key, kvar]) => ({
+          var: key,
+          val: kvar.value()
+        }))
       );
-      const trace = solution[0];
-      if (!trace) {
-        this.renderError("Failed to route net islands");
-        return;
-      }
-      db.pcb_trace.insert(trace);
     }
-  }
-};
-
-// lib/utils/components/createNetsFromProps.ts
-var createNetsFromProps = (component, props) => {
-  for (const prop of props) {
-    if (typeof prop === "string" && prop.startsWith("net.")) {
-      if (!component.getSubcircuit().selectOne(prop)) {
-        component.getSubcircuit().add(new Net({ name: prop.split("net.")[1] }));
-      }
+    const bounds = {
+      left: Infinity,
+      right: -Infinity,
+      top: -Infinity,
+      bottom: Infinity
+    };
+    for (const {
+      selector,
+      bounds: { width, height }
+    } of involvedComponents) {
+      const kvx = getKVar(`${selector}_x`);
+      const kvy = getKVar(`${selector}_y`);
+      const newLeft = kvx.value() - width / 2;
+      const newRight = kvx.value() + width / 2;
+      const newTop = kvy.value() + height / 2;
+      const newBottom = kvy.value() - height / 2;
+      bounds.left = Math.min(bounds.left, newLeft);
+      bounds.right = Math.max(bounds.right, newRight);
+      bounds.top = Math.max(bounds.top, newTop);
+      bounds.bottom = Math.min(bounds.bottom, newBottom);
     }
-  }
-};
-
-// lib/utils/get-bounds-of-pcb-components.ts
-function getBoundsOfPcbComponents(components) {
-  let minX = Infinity;
-  let minY = Infinity;
-  let maxX = -Infinity;
-  let maxY = -Infinity;
-  for (const child of components) {
-    if (child.isPcbPrimitive) {
-      const { x, y } = child._getGlobalPcbPositionBeforeLayout();
-      const { width: width2, height: height2 } = child.getPcbSize();
-      minX = Math.min(minX, x - width2 / 2);
-      minY = Math.min(minY, y - height2 / 2);
-      maxX = Math.max(maxX, x + width2 / 2);
-      maxY = Math.max(maxY, y + height2 / 2);
-    } else if (child.componentName === "Footprint") {
-      const childBounds = getBoundsOfPcbComponents(child.children);
-      minX = Math.min(minX, childBounds.minX);
-      minY = Math.min(minY, childBounds.minY);
-      maxX = Math.max(maxX, childBounds.maxX);
-      maxY = Math.max(maxY, childBounds.maxY);
+    const globalOffset = {
+      x: -(bounds.right + bounds.left) / 2,
+      y: -(bounds.top + bounds.bottom) / 2
+    };
+    const containerPos = this.getPrimitiveContainer()._getGlobalPcbPositionBeforeLayout();
+    globalOffset.x += containerPos.x;
+    globalOffset.y += containerPos.y;
+    for (const { component, selector } of involvedComponents) {
+      const kvx = getKVar(`${selector}_x`);
+      const kvy = getKVar(`${selector}_y`);
+      component._setPositionFromLayout({
+        x: kvx.value() + globalOffset.x,
+        y: kvy.value() + globalOffset.y
+      });
     }
   }
-  let width = maxX - minX;
-  let height = maxY - minY;
-  if (width < 0) width = 0;
-  if (height < 0) height = 0;
-  return {
-    minX,
-    minY,
-    maxX,
-    maxY,
-    width,
-    height
-  };
-}
+};
 
 // lib/components/base-components/NormalComponent.ts
-import { rotation } from "circuit-json";
 var rotation3 = z4.object({
   x: rotation,
   y: rotation,
@@ -1786,6 +1782,36 @@ var NormalComponent = class extends PrimitiveComponent {
   initPorts() {
     const { config } = this;
     const portsToCreate = [];
+    const schPortArrangement = this._parsedProps.schPortArrangement;
+    if (schPortArrangement) {
+      for (const side in schPortArrangement) {
+        const pins = schPortArrangement[side].pins;
+        if (Array.isArray(pins)) {
+          for (const pinNumber of pins) {
+            portsToCreate.push(new Port({ pinNumber }));
+          }
+        }
+      }
+    }
+    const pinLabels = this._parsedProps.pinLabels;
+    if (pinLabels) {
+      for (let [pinNumber, label] of Object.entries(pinLabels)) {
+        pinNumber = pinNumber.replace("pin", "");
+        let existingPort = portsToCreate.find(
+          (p) => p._parsedProps.pinNumber === Number(pinNumber)
+        );
+        if (!existingPort) {
+          existingPort = new Port({
+            pinNumber: parseInt(pinNumber),
+            name: label
+          });
+          portsToCreate.push(existingPort);
+        } else {
+          existingPort.externallyAddedAliases.push(label);
+          existingPort.props.name = label;
+        }
+      }
+    }
     if (config.schematicSymbolName) {
       const sym = symbols2[`${config.schematicSymbolName}_horz`];
       if (!sym) return;
@@ -1800,21 +1826,9 @@ var NormalComponent = class extends PrimitiveComponent {
       return;
     }
     const portsFromFootprint = this.getPortsFromFootprint();
-    portsToCreate.push(...portsFromFootprint);
-    const pinLabels = this._parsedProps.pinLabels;
-    if (pinLabels) {
-      for (let [pinNumber, label] of Object.entries(pinLabels)) {
-        pinNumber = pinNumber.replace("pin", "");
-        const existingPort = portsToCreate.find(
-          (p) => p._parsedProps.pinNumber === Number(pinNumber)
-        );
-        if (!existingPort) {
-          throw new Error(
-            `Could not find port for pin number ${pinNumber} in chip ${this.getString()}`
-          );
-        }
-        existingPort.externallyAddedAliases.push(label);
-        existingPort.props.name = label;
+    for (const port of portsFromFootprint) {
+      if (!portsToCreate.some((p) => p.isMatchingAnyOf(port.getNameAndAliases()))) {
+        portsToCreate.push(port);
       }
     }
     if (portsToCreate.length > 0) {
@@ -2996,20 +3010,27 @@ var FTYPE = stringProxy;
 
 // lib/components/normal-components/Diode.ts
 var Diode = class extends NormalComponent {
-  pin1 = this.portMap.pin1;
-  pin2 = this.portMap.pin2;
+  // @ts-ignore
   get config() {
     return {
-      // schematicSymbolName: "diode" as BaseSymbolName,
+      schematicSymbolName: this.props.symbolName ?? "diode_horz",
       componentName: "Diode",
       zodProps: diodeProps,
       sourceFtype: "simple_diode"
     };
   }
   initPorts() {
-    this.add(new Port({ name: "pin1", aliases: ["1", "pin1"] }));
-    this.add(new Port({ name: "pin2", aliases: ["2", "pin2"] }));
+    this.add(
+      new Port({ name: "pin1", pinNumber: 1, aliases: ["anode", "pos"] })
+    );
+    this.add(
+      new Port({ name: "pin2", pinNumber: 2, aliases: ["cathode", "neg"] })
+    );
   }
+  pos = this.portMap.pin1;
+  anode = this.portMap.pin1;
+  neg = this.portMap.pin2;
+  cathode = this.portMap.pin2;
 };
 
 // lib/components/normal-components/Capacitor.ts
@@ -3068,8 +3089,52 @@ var Capacitor = class extends NormalComponent {
 // lib/components/normal-components/Chip.ts
 import { chipProps } from "@tscircuit/props";
 
-// lib/utils/schematic/getAllDimensionsForSchematicBox.ts
+// lib/soup/underscorifyPinStyles.ts
 import "circuit-json";
+import "zod";
+var underscorifyPinStyles = (pinStyles) => {
+  if (!pinStyles) return void 0;
+  const underscorePinStyles = {};
+  for (const [pinName, pinStyle] of Object.entries(pinStyles)) {
+    underscorePinStyles[pinName] = {
+      bottom_margin: pinStyle.bottomMargin,
+      left_margin: pinStyle.leftMargin,
+      right_margin: pinStyle.rightMargin,
+      top_margin: pinStyle.topMargin
+    };
+  }
+  return underscorePinStyles;
+};
+
+// lib/soup/underscorifyPortArrangement.ts
+var underscorifyPortArrangement = (portArrangement) => {
+  if (!portArrangement) return void 0;
+  if ("leftSide" in portArrangement || "rightSide" in portArrangement || "topSide" in portArrangement || "bottomSide" in portArrangement) {
+    return {
+      left_side: portArrangement.leftSide,
+      right_side: portArrangement.rightSide,
+      top_side: portArrangement.topSide,
+      bottom_side: portArrangement.bottomSide
+    };
+  }
+  if ("leftPinCount" in portArrangement || "rightPinCount" in portArrangement || "topPinCount" in portArrangement || "bottomPinCount" in portArrangement) {
+    return {
+      left_size: portArrangement.leftPinCount,
+      right_size: portArrangement.rightPinCount,
+      top_size: portArrangement.topPinCount,
+      bottom_size: portArrangement.bottomPinCount
+    };
+  }
+  if ("leftSize" in portArrangement || "rightSize" in portArrangement || "topSize" in portArrangement || "bottomSize" in portArrangement) {
+    return {
+      left_size: portArrangement.leftSize,
+      right_size: portArrangement.rightSize,
+      top_size: portArrangement.topSize,
+      bottom_size: portArrangement.bottomSize
+    };
+  }
+  return void 0;
+};
 
 // lib/utils/schematic/getSizeOfSidesFromPortArrangement.ts
 var hasExplicitPinMapping = (pa) => {
@@ -3101,8 +3166,9 @@ var getSizeOfSidesFromPortArrangement = (pa) => {
 };
 
 // lib/utils/schematic/getAllDimensionsForSchematicBox.ts
-import "@tscircuit/props";
-import "zod";
+function isExplicitPinMappingArrangement(arrangement) {
+  return arrangement.leftSide !== void 0;
+}
 var getAllDimensionsForSchematicBox = (params) => {
   const portDistanceFromEdge = params.portDistanceFromEdge ?? params.schPinSpacing * 2;
   let sidePinCounts = params.schPortArrangement ? getSizeOfSidesFromPortArrangement(params.schPortArrangement) : null;
@@ -3141,7 +3207,7 @@ var getAllDimensionsForSchematicBox = (params) => {
   let currentDistanceFromEdge = 0;
   let truePinIndex = 0;
   for (let sideIndex = 0; sideIndex < sidePinCounts.leftSize; sideIndex++) {
-    const pinNumber = truePinIndex + 1;
+    const pinNumber = params.schPortArrangement && isExplicitPinMappingArrangement(params.schPortArrangement) ? params.schPortArrangement?.leftSide?.pins[sideIndex] : truePinIndex + 1;
     const pinStyle = params.schPinStyle?.[`pin${pinNumber}`] ?? params.schPinStyle?.[pinNumber];
     if (pinStyle?.topMargin) {
       currentDistanceFromEdge += pinStyle.topMargin;
@@ -3165,7 +3231,7 @@ var getAllDimensionsForSchematicBox = (params) => {
   }
   currentDistanceFromEdge = 0;
   for (let sideIndex = 0; sideIndex < sidePinCounts.bottomSize; sideIndex++) {
-    const pinNumber = truePinIndex + 1;
+    const pinNumber = params.schPortArrangement && isExplicitPinMappingArrangement(params.schPortArrangement) ? params.schPortArrangement.bottomSide?.pins[sideIndex] : truePinIndex + 1;
     const pinStyle = params.schPinStyle?.[`pin${pinNumber}`] ?? params.schPinStyle?.[pinNumber];
     if (pinStyle?.leftMargin) {
       currentDistanceFromEdge += pinStyle.leftMargin;
@@ -3189,7 +3255,7 @@ var getAllDimensionsForSchematicBox = (params) => {
   }
   currentDistanceFromEdge = 0;
   for (let sideIndex = 0; sideIndex < sidePinCounts.rightSize; sideIndex++) {
-    const pinNumber = truePinIndex + 1;
+    const pinNumber = params.schPortArrangement && isExplicitPinMappingArrangement(params.schPortArrangement) ? params.schPortArrangement.rightSide?.pins[sideIndex] : truePinIndex + 1;
     const pinStyle = params.schPinStyle?.[`pin${pinNumber}`] ?? params.schPinStyle?.[pinNumber];
     if (pinStyle?.bottomMargin) {
       currentDistanceFromEdge += pinStyle.bottomMargin;
@@ -3213,7 +3279,7 @@ var getAllDimensionsForSchematicBox = (params) => {
   }
   currentDistanceFromEdge = 0;
   for (let sideIndex = 0; sideIndex < sidePinCounts.topSize; sideIndex++) {
-    const pinNumber = truePinIndex + 1;
+    const pinNumber = params.schPortArrangement && isExplicitPinMappingArrangement(params.schPortArrangement) ? params.schPortArrangement.topSide?.pins[sideIndex] : truePinIndex + 1;
     const pinStyle = params.schPinStyle?.[`pin${pinNumber}`] ?? params.schPinStyle?.[pinNumber];
     if (pinStyle?.rightMargin) {
       currentDistanceFromEdge += pinStyle.rightMargin;
@@ -3293,9 +3359,7 @@ var getAllDimensionsForSchematicBox = (params) => {
         (p) => p.pinNumber.toString() === pinNumber.toString()
       );
       if (!port) {
-        throw new Error(
-          `Could not find port for pin number ${pinNumber}, available pins: ${truePortsWithPositions.map((tp) => tp.pinNumber).join(", ")}`
-        );
+        return { x: 0, y: 0 };
       }
       return port;
     },
@@ -3306,53 +3370,6 @@ var getAllDimensionsForSchematicBox = (params) => {
   };
 };
 
-// lib/soup/underscorifyPortArrangement.ts
-var underscorifyPortArrangement = (portArrangement) => {
-  if (!portArrangement) return void 0;
-  if ("leftSide" in portArrangement || "rightSide" in portArrangement || "topSide" in portArrangement || "bottomSide" in portArrangement) {
-    return {
-      left_side: portArrangement.leftSide,
-      right_side: portArrangement.rightSide,
-      top_side: portArrangement.topSide,
-      bottom_side: portArrangement.bottomSide
-    };
-  }
-  if ("leftPinCount" in portArrangement || "rightPinCount" in portArrangement || "topPinCount" in portArrangement || "bottomPinCount" in portArrangement) {
-    return {
-      left_size: portArrangement.leftPinCount,
-      right_size: portArrangement.rightPinCount,
-      top_size: portArrangement.topPinCount,
-      bottom_size: portArrangement.bottomPinCount
-    };
-  }
-  if ("leftSize" in portArrangement || "rightSize" in portArrangement || "topSize" in portArrangement || "bottomSize" in portArrangement) {
-    return {
-      left_size: portArrangement.leftSize,
-      right_size: portArrangement.rightSize,
-      top_size: portArrangement.topSize,
-      bottom_size: portArrangement.bottomSize
-    };
-  }
-  return void 0;
-};
-
-// lib/soup/underscorifyPinStyles.ts
-import "circuit-json";
-import "zod";
-var underscorifyPinStyles = (pinStyles) => {
-  if (!pinStyles) return void 0;
-  const underscorePinStyles = {};
-  for (const [pinName, pinStyle] of Object.entries(pinStyles)) {
-    underscorePinStyles[pinName] = {
-      bottom_margin: pinStyle.bottomMargin,
-      left_margin: pinStyle.leftMargin,
-      right_margin: pinStyle.rightMargin,
-      top_margin: pinStyle.topMargin
-    };
-  }
-  return underscorePinStyles;
-};
-
 // lib/components/normal-components/Chip.ts
 var Chip = class extends NormalComponent {
   schematicDimensions = null;