@tscircuit/core 0.0.34 → 0.0.36

package/dist/index.d.ts

@@ -534,6 +534,10 @@ declare class Port extends PrimitiveComponent<typeof portProps> {
     doInitialSourceParentAttachment(): void;
     doInitialPcbPortRender(): void;
     doInitialSchematicPortRender(): void;
+    _setPositionFromLayout(newCenter: {
+        x: number;
+        y: number;
+    }): void;
 }
 
 type ReactSubtree = {
@@ -3441,6 +3445,7 @@ declare class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
 declare const edgeSpecifiers: readonly ["leftedge", "rightedge", "topedge", "bottomedge", "center"];
 type EdgeSpecifier = (typeof edgeSpecifiers)[number];
 declare class Constraint extends PrimitiveComponent<typeof constraintProps> {
+    componentName: string;
     get config(): {
         zodProps: z.ZodUnion<[z.ZodObject<{
             pcb: z.ZodOptional<z.ZodLiteral<true>>;

package/dist/index.js

@@ -213,8 +213,8 @@ var PrimitiveComponent = class extends Renderable {
     );
     if (!this.componentName) {
       this.componentName = this.constructor.name;
-      this.lowercaseComponentName = this.componentName.toLowerCase();
     }
+    this.lowercaseComponentName = this.componentName.toLowerCase();
   }
   setProps(props) {
     const newProps = this.config.zodProps.parse({
@@ -681,6 +681,9 @@ var Footprint = class extends PrimitiveComponent {
       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`);
@@ -869,6 +872,12 @@ var Port = class extends PrimitiveComponent {
     });
     this.schematic_port_id = schematic_port.schematic_port_id;
   }
+  _setPositionFromLayout(newCenter) {
+    const { db } = this.root;
+    db.schematic_port.update(this.schematic_port_id, {
+      center: newCenter
+    });
+  }
 };
 
 // lib/components/base-components/NormalComponent.ts
@@ -2982,6 +2991,7 @@ var edgeSpecifiers = [
   "center"
 ];
 var Constraint2 = class extends PrimitiveComponent {
+  componentName = "Constraint";
   get config() {
     return {
       zodProps: constraintProps
@@ -3002,9 +3012,9 @@ var Constraint2 = class extends PrimitiveComponent {
   }
   _getAllReferencedComponents() {
     const componentsWithSelectors = [];
-    const subcircuit = this.getSubcircuit();
+    const container = this.getPrimitiveContainer();
     function addComponentFromSelector(selector) {
-      const component = subcircuit.selectOne(selector);
+      const component = container.selectOne(selector);
       if (component) {
         const maybeEdge = selector.split(" ").pop();
         const edge = edgeSpecifiers.includes(maybeEdge) ? maybeEdge : void 0;

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

@@ -92,8 +92,8 @@ export abstract class PrimitiveComponent<
     ) as z.infer<ZodProps>
     if (!this.componentName) {
       this.componentName = this.constructor.name
-      this.lowercaseComponentName = this.componentName.toLowerCase()
     }
+    this.lowercaseComponentName = this.componentName.toLowerCase()
   }
 
   setProps(props: Partial<z.input<ZodProps>>) {

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

@@ -13,6 +13,8 @@ const edgeSpecifiers = [
 export type EdgeSpecifier = (typeof edgeSpecifiers)[number]
 
 export class Constraint extends PrimitiveComponent<typeof constraintProps> {
+  componentName = "Constraint"
+
   get config() {
     return {
       zodProps: constraintProps,
@@ -49,12 +51,12 @@ export class Constraint extends PrimitiveComponent<typeof constraintProps> {
       edge: EdgeSpecifier | undefined
     }> = []
 
-    const subcircuit = this.getSubcircuit()
+    const container = this.getPrimitiveContainer()!
 
     function addComponentFromSelector(selector: string) {
       // TODO this selector has to be modified in case it contains a leftedge,
       // center/topedge/rightedge indicator
-      const component = subcircuit.selectOne(selector)
+      const component = container.selectOne(selector)
       if (component) {
         const maybeEdge = selector.split(" ").pop() as EdgeSpecifier
         const edge = edgeSpecifiers.includes(maybeEdge) ? maybeEdge : undefined

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

@@ -220,6 +220,12 @@ export class Footprint extends PrimitiveComponent<typeof footprintProps> {
       y: -(bounds.top + bounds.bottom) / 2,
     }
 
+    const containerPos =
+      this.getPrimitiveContainer()!._getGlobalPcbPositionBeforeLayout()
+
+    globalOffset.x += containerPos.x
+    globalOffset.y += containerPos.y
+
     // 4. Update the component positions
     for (const { component, selector } of involvedComponents) {
       const kvx = getKVar(`${selector}_x`)

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

@@ -205,4 +205,12 @@ export class Port extends PrimitiveComponent<typeof portProps> {
 
     this.schematic_port_id = schematic_port.schematic_port_id
   }
+
+  _setPositionFromLayout(newCenter: { x: number; y: number }): void {
+    const { db } = this.root!
+
+    db.schematic_port.update(this.schematic_port_id!, {
+      center: newCenter,
+    })
+  }
 }

package/package.json

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