@tscircuit/core 0.0.39 → 0.0.41

package/dist/index.d.ts

@@ -141,10 +141,10 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
     _computePcbGlobalTransformBeforeLayout(): Matrix;
     getPrimitiveContainer(): PrimitiveComponent | null;
     /**
-     * Compute the bounds of this component the circuit json elements associated
-     * with it.
+     * Compute the PCB bounds of this component the circuit json elements
+     * associated with it.
      */
-    _getCircuitJsonBounds(): {
+    _getPcbCircuitJsonBounds(): {
         center: {
             x: number;
             y: number;
@@ -161,7 +161,7 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
     /**
      * Set the position of this component from the layout solver. This method
      * should operate using CircuitJson associated with this component, like
-     * _getCircuitJsonBounds it can be called multiple times as different
+     * _getPcbCircuitJsonBounds it can be called multiple times as different
      * parents apply layout to their children.
      */
     _setPositionFromLayout(newCenter: {
@@ -512,6 +512,24 @@ declare class Port extends PrimitiveComponent<typeof portProps> {
         x: number;
         y: number;
     };
+    _getPcbCircuitJsonBounds(): {
+        center: {
+            x: number;
+            y: number;
+        };
+        bounds: {
+            left: number;
+            top: number;
+            right: number;
+            bottom: number;
+        };
+        width: number;
+        height: number;
+    };
+    _getGlobalPcbPositionAfterLayout(): {
+        x: number;
+        y: number;
+    };
     _getGlobalSchematicPositionBeforeLayout(): {
         x: number;
         y: number;
@@ -770,7 +788,7 @@ declare class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
     };
     doInitialPortMatching(): void;
     doInitialPcbPrimitiveRender(): void;
-    _getCircuitJsonBounds(): {
+    _getPcbCircuitJsonBounds(): {
         center: {
             x: number;
             y: number;
@@ -3819,7 +3837,7 @@ declare class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
         width: number;
         height: number;
     };
-    _getCircuitJsonBounds(): {
+    _getPcbCircuitJsonBounds(): {
         center: {
             x: number;
             y: number;
@@ -3985,7 +4003,7 @@ declare class Hole extends PrimitiveComponent<typeof holeProps> {
         height: number;
     };
     doInitialPcbPrimitiveRender(): void;
-    _getCircuitJsonBounds(): {
+    _getPcbCircuitJsonBounds(): {
         center: {
             x: number;
             y: number;

package/dist/index.js

@@ -274,10 +274,10 @@ var PrimitiveComponent = class extends Renderable {
     return this.parent?.getPrimitiveContainer?.() ?? null;
   }
   /**
-   * Compute the bounds of this component the circuit json elements associated
-   * with it.
+   * Compute the PCB bounds of this component the circuit json elements
+   * associated with it.
    */
-  _getCircuitJsonBounds() {
+  _getPcbCircuitJsonBounds() {
     return {
       center: { x: 0, y: 0 },
       bounds: { left: 0, top: 0, right: 0, bottom: 0 },
@@ -288,7 +288,7 @@ var PrimitiveComponent = class extends Renderable {
   /**
    * Set the position of this component from the layout solver. This method
    * should operate using CircuitJson associated with this component, like
-   * _getCircuitJsonBounds it can be called multiple times as different
+   * _getPcbCircuitJsonBounds it can be called multiple times as different
    * parents apply layout to their children.
    */
   _setPositionFromLayout(newCenter) {
@@ -529,7 +529,7 @@ var Footprint = class extends PrimitiveComponent {
       selector,
       componentSelector,
       edge,
-      bounds: component._getCircuitJsonBounds()
+      bounds: component._getPcbCircuitJsonBounds()
     }));
     if (involvedComponents.some((c) => c.edge)) {
       throw new Error(
@@ -745,6 +745,22 @@ var Port = class extends PrimitiveComponent {
     }
     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(), {
@@ -845,11 +861,11 @@ var Port = class extends PrimitiveComponent {
       );
     }
     const pcbMatch = pcbMatches[0];
-    if ("_getCircuitJsonBounds" in pcbMatch) {
+    if ("_getPcbCircuitJsonBounds" in pcbMatch) {
       const pcb_port = db.pcb_port.insert({
         pcb_component_id: this.parent?.pcb_component_id,
         layers: ["top"],
-        ...pcbMatch._getCircuitJsonBounds().center,
+        ...pcbMatch._getPcbCircuitJsonBounds().center,
         source_port_id: this.source_port_id
       });
       this.pcb_port_id = pcb_port.pcb_port_id;
@@ -876,8 +892,10 @@ var Port = class extends PrimitiveComponent {
   }
   _setPositionFromLayout(newCenter) {
     const { db } = this.root;
-    db.schematic_port.update(this.schematic_port_id, {
-      center: newCenter
+    if (!this.pcb_port_id) return;
+    db.pcb_port.update(this.pcb_port_id, {
+      x: newCenter.x,
+      y: newCenter.y
     });
   }
 };
@@ -1134,7 +1152,7 @@ var SmtPad = class extends PrimitiveComponent {
       this.pcb_smtpad_id = pcb_smtpad.pcb_smtpad_id;
     }
   }
-  _getCircuitJsonBounds() {
+  _getPcbCircuitJsonBounds() {
     const { db } = this.root;
     const smtpad = db.pcb_smtpad.get(this.pcb_smtpad_id);
     if (smtpad.shape === "rect") {
@@ -1173,6 +1191,7 @@ var SmtPad = class extends PrimitiveComponent {
       x: newCenter.x,
       y: newCenter.y
     });
+    this.matchedPort?._setPositionFromLayout(newCenter);
   }
 };
 
@@ -1239,7 +1258,7 @@ var PlatedHole = class extends PrimitiveComponent {
       `getPcbSize for shape "${props.shape}" not implemented for ${this.componentName}`
     );
   }
-  _getCircuitJsonBounds() {
+  _getPcbCircuitJsonBounds() {
     const { db } = this.root;
     const platedHole = db.pcb_plated_hole.get(this.pcb_plated_hole_id);
     const size = this.getPcbSize();
@@ -1261,10 +1280,11 @@ var PlatedHole = class extends PrimitiveComponent {
       x: newCenter.x,
       y: newCenter.y
     });
+    this.matchedPort?._setPositionFromLayout(newCenter);
   }
   doInitialPortMatching() {
-    const parentPorts = (this.parent?.children ?? []).filter(
-      (c) => c.componentName === "Port"
+    const parentPorts = this.getPrimitiveContainer()?.selectAll(
+      "port"
     );
     if (!this.props.portHints) {
       return;
@@ -2035,7 +2055,7 @@ function getClosest(point, candidates) {
 // lib/components/primitive-components/Trace.ts
 import "zod";
 var portToObjective = (port) => {
-  const portPosition = port._getGlobalPcbPositionBeforeLayout();
+  const portPosition = port._getGlobalPcbPositionAfterLayout();
   return {
     ...portPosition,
     layers: port.getAvailablePcbLayers()
@@ -3034,14 +3054,17 @@ var Constraint2 = class extends PrimitiveComponent {
     const componentsWithSelectors = [];
     const container = this.getPrimitiveContainer();
     function addComponentFromSelector(selector) {
-      const component = container.selectOne(selector);
+      const maybeEdge = selector.split(" ").pop();
+      const edge = edgeSpecifiers.includes(maybeEdge) ? maybeEdge : void 0;
+      const componentSelector = edge ? selector.replace(` ${edge}`, "") : selector;
+      const component = container.selectOne(componentSelector, {
+        pcbPrimitive: true
+      });
       if (component) {
-        const maybeEdge = selector.split(" ").pop();
-        const edge = edgeSpecifiers.includes(maybeEdge) ? maybeEdge : void 0;
         componentsWithSelectors.push({
           selector,
           component,
-          componentSelector: edge ? selector.replace(` ${edge}`, "") : selector,
+          componentSelector,
           edge
         });
       }
@@ -3087,7 +3110,7 @@ var Hole = class extends PrimitiveComponent {
     });
     this.pcb_hole_id = inserted_hole.pcb_hole_id;
   }
-  _getCircuitJsonBounds() {
+  _getPcbCircuitJsonBounds() {
     const { db } = this.root;
     const hole = db.pcb_hole.get(this.pcb_hole_id);
     const size = this.getPcbSize();

package/lib/components/base-components/PrimitiveComponent.ts

@@ -166,10 +166,10 @@ export abstract class PrimitiveComponent<
   }
 
   /**
-   * Compute the bounds of this component the circuit json elements associated
-   * with it.
+   * Compute the PCB bounds of this component the circuit json elements
+   * associated with it.
    */
-  _getCircuitJsonBounds(): {
+  _getPcbCircuitJsonBounds(): {
     center: { x: number; y: number }
     bounds: { left: number; top: number; right: number; bottom: number }
     width: number
@@ -186,7 +186,7 @@ export abstract class PrimitiveComponent<
   /**
    * Set the position of this component from the layout solver. This method
    * should operate using CircuitJson associated with this component, like
-   * _getCircuitJsonBounds it can be called multiple times as different
+   * _getPcbCircuitJsonBounds it can be called multiple times as different
    * parents apply layout to their children.
    */
   _setPositionFromLayout(newCenter: { x: number; y: number }) {

package/lib/components/primitive-components/Constraint.ts

@@ -56,15 +56,19 @@ export class Constraint extends PrimitiveComponent<typeof constraintProps> {
     function addComponentFromSelector(selector: string) {
       // TODO this selector has to be modified in case it contains a leftedge,
       // center/topedge/rightedge indicator
-      const component = container.selectOne(selector)
+      const maybeEdge = selector.split(" ").pop() as EdgeSpecifier
+      const edge = edgeSpecifiers.includes(maybeEdge) ? maybeEdge : undefined
+      const componentSelector = edge
+        ? selector.replace(` ${edge}`, "")
+        : selector
+      const component = container.selectOne(componentSelector, {
+        pcbPrimitive: true,
+      })
       if (component) {
-        const maybeEdge = selector.split(" ").pop() as EdgeSpecifier
-        const edge = edgeSpecifiers.includes(maybeEdge) ? maybeEdge : undefined
-
         componentsWithSelectors.push({
           selector,
           component,
-          componentSelector: edge ? selector.replace(` ${edge}`, "") : selector,
+          componentSelector,
           edge,
         })
       }

package/lib/components/primitive-components/Footprint.ts

@@ -28,7 +28,7 @@ export class Footprint extends PrimitiveComponent<typeof footprintProps> {
         selector,
         componentSelector,
         edge,
-        bounds: component._getCircuitJsonBounds(),
+        bounds: component._getPcbCircuitJsonBounds(),
       }))
 
     if (involvedComponents.some((c) => c.edge)) {

package/lib/components/primitive-components/Hole.ts

@@ -32,7 +32,7 @@ export class Hole extends PrimitiveComponent<typeof holeProps> {
     this.pcb_hole_id = inserted_hole.pcb_hole_id!
   }
 
-  _getCircuitJsonBounds(): {
+  _getPcbCircuitJsonBounds(): {
     center: { x: number; y: number }
     bounds: { left: number; top: number; right: number; bottom: number }
     width: number

package/lib/components/primitive-components/PlatedHole.ts

@@ -27,7 +27,7 @@ export class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
     )
   }
 
-  _getCircuitJsonBounds(): {
+  _getPcbCircuitJsonBounds(): {
     center: { x: number; y: number }
     bounds: { left: number; top: number; right: number; bottom: number }
     width: number
@@ -56,11 +56,12 @@ export class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
       x: newCenter.x,
       y: newCenter.y,
     })
+    this.matchedPort?._setPositionFromLayout(newCenter)
   }
 
   doInitialPortMatching(): void {
-    const parentPorts = (this.parent?.children ?? []).filter(
-      (c) => c.componentName === "Port",
+    const parentPorts = this.getPrimitiveContainer()?.selectAll(
+      "port",
     ) as Port[]
 
     if (!this.props.portHints) {

package/lib/components/primitive-components/Port.ts

@@ -44,6 +44,24 @@ export class Port extends PrimitiveComponent<typeof portProps> {
     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(): { x: number; y: number } {
+    return this._getPcbCircuitJsonBounds().center
+  }
+
   _getGlobalSchematicPositionBeforeLayout(): { x: number; y: number } {
     if (!this.schematicSymbolPortDef) {
       return applyToPoint(this.parent!.computeSchematicGlobalTransform(), {
@@ -168,12 +186,12 @@ export class Port extends PrimitiveComponent<typeof portProps> {
 
     const pcbMatch: any = pcbMatches[0]
 
-    if ("_getCircuitJsonBounds" in pcbMatch) {
+    if ("_getPcbCircuitJsonBounds" in pcbMatch) {
       const pcb_port = db.pcb_port.insert({
         pcb_component_id: this.parent?.pcb_component_id!,
         layers: ["top"],
 
-        ...pcbMatch._getCircuitJsonBounds().center,
+        ...pcbMatch._getPcbCircuitJsonBounds().center,
 
         source_port_id: this.source_port_id!,
       })
@@ -208,9 +226,11 @@ export class Port extends PrimitiveComponent<typeof portProps> {
 
   _setPositionFromLayout(newCenter: { x: number; y: number }): void {
     const { db } = this.root!
+    if (!this.pcb_port_id) return
 
-    db.schematic_port.update(this.schematic_port_id!, {
-      center: newCenter,
+    db.pcb_port.update(this.pcb_port_id!, {
+      x: newCenter.x,
+      y: newCenter.y,
     })
   }
 }

package/lib/components/primitive-components/SmtPad.ts

@@ -97,7 +97,7 @@ export class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
     }
   }
 
-  _getCircuitJsonBounds(): {
+  _getPcbCircuitJsonBounds(): {
     center: { x: number; y: number }
     bounds: { left: number; top: number; right: number; bottom: number }
     width: number
@@ -143,5 +143,6 @@ export class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
       x: newCenter.x,
       y: newCenter.y,
     })
+    this.matchedPort?._setPositionFromLayout(newCenter)
   }
 }

package/lib/components/primitive-components/Trace.ts

@@ -38,7 +38,7 @@ type PcbRouteObjective =
   | { layers: string[]; x: number; y: number; via?: boolean }
 
 const portToObjective = (port: Port): PcbRouteObjective => {
-  const portPosition = port._getGlobalPcbPositionBeforeLayout()
+  const portPosition = port._getGlobalPcbPositionAfterLayout()
   return {
     ...portPosition,
     layers: port.getAvailablePcbLayers(),

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/core",
   "module": "index.ts",
   "type": "module",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "files": [