@tscircuit/core 0.0.1029 → 0.0.1031

package/dist/index.js

@@ -9996,13 +9996,31 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     if (!this.pcb_component_id) return;
     const { db } = this.root;
     const props = this._parsedProps;
-    const hasExplicitPcbPosition = props.pcbX !== void 0 || props.pcbY !== void 0;
+    const rawProps = this.props;
+    const pcbLeftEdgeX = props.pcbLeftEdgeX ?? rawProps.pcbLeftEdgeX;
+    const pcbRightEdgeX = props.pcbRightEdgeX ?? rawProps.pcbRightEdgeX;
+    const pcbTopEdgeY = props.pcbTopEdgeY ?? rawProps.pcbTopEdgeY;
+    const pcbBottomEdgeY = props.pcbBottomEdgeY ?? rawProps.pcbBottomEdgeY;
+    const hasExplicitPcbPosition = props.pcbX !== void 0 || props.pcbY !== void 0 || pcbLeftEdgeX !== void 0 || pcbRightEdgeX !== void 0 || pcbTopEdgeY !== void 0 || pcbBottomEdgeY !== void 0;
     if (!hasExplicitPcbPosition) return;
+    if (pcbLeftEdgeX !== void 0 && pcbRightEdgeX !== void 0) {
+      throw new Error(
+        `${this.componentName} cannot set both pcbLeftEdgeX and pcbRightEdgeX`
+      );
+    }
+    if (pcbTopEdgeY !== void 0 && pcbBottomEdgeY !== void 0) {
+      throw new Error(
+        `${this.componentName} cannot set both pcbTopEdgeY and pcbBottomEdgeY`
+      );
+    }
+    const pcbComponent = db.pcb_component.get(this.pcb_component_id);
+    const componentWidth = pcbComponent?.width ?? 0;
+    const componentHeight = pcbComponent?.height ?? 0;
     const parentGroup = this.getGroup();
     const positionedRelativeToGroupId = parentGroup?.pcb_group_id ?? void 0;
     const positionedRelativeToBoardId = positionedRelativeToGroupId ? void 0 : this._getBoard()?.pcb_board_id ?? void 0;
-    const resolvedPcbX = this._resolvedPcbCalcOffsetX ?? (props.pcbX !== void 0 ? this._resolvePcbCoordinate(props.pcbX, "pcbX") : void 0);
-    const resolvedPcbY = this._resolvedPcbCalcOffsetY ?? (props.pcbY !== void 0 ? this._resolvePcbCoordinate(props.pcbY, "pcbY") : void 0);
+    const resolvedPcbX = this._resolvedPcbCalcOffsetX ?? (props.pcbX !== void 0 ? this._resolvePcbCoordinate(props.pcbX, "pcbX") : pcbLeftEdgeX !== void 0 ? this._resolvePcbCoordinate(pcbLeftEdgeX, "pcbX") + componentWidth / 2 : pcbRightEdgeX !== void 0 ? this._resolvePcbCoordinate(pcbRightEdgeX, "pcbX") - componentWidth / 2 : void 0);
+    const resolvedPcbY = this._resolvedPcbCalcOffsetY ?? (props.pcbY !== void 0 ? this._resolvePcbCoordinate(props.pcbY, "pcbY") : pcbTopEdgeY !== void 0 ? this._resolvePcbCoordinate(pcbTopEdgeY, "pcbY") - componentHeight / 2 : pcbBottomEdgeY !== void 0 ? this._resolvePcbCoordinate(pcbBottomEdgeY, "pcbY") + componentHeight / 2 : void 0);
     db.pcb_component.update(this.pcb_component_id, {
       position_mode: "relative_to_group_anchor",
       positioned_relative_to_pcb_group_id: positionedRelativeToGroupId,
@@ -10031,7 +10049,8 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
    * and should not be moved by automatic packing/layout algorithms
    */
   isRelativelyPositioned() {
-    return this._parsedProps.pcbX !== void 0 || this._parsedProps.pcbY !== void 0;
+    const rawProps = this.props;
+    return this._parsedProps.pcbX !== void 0 || this._parsedProps.pcbY !== void 0 || this._parsedProps.pcbLeftEdgeX !== void 0 || this._parsedProps.pcbRightEdgeX !== void 0 || this._parsedProps.pcbTopEdgeY !== void 0 || this._parsedProps.pcbBottomEdgeY !== void 0 || rawProps.pcbLeftEdgeX !== void 0 || rawProps.pcbRightEdgeX !== void 0 || rawProps.pcbTopEdgeY !== void 0 || rawProps.pcbBottomEdgeY !== void 0;
   }
 };
 
@@ -11185,6 +11204,7 @@ var TraceHint = class extends PrimitiveComponent2 {
 };
 
 // lib/components/primitive-components/Group/Group_doInitialPcbCalcPlacementResolution.ts
+import { getBoundsOfPcbElements } from "@tscircuit/circuit-json-util";
 var SUPPORTED_COMPONENT_FIELDS = /* @__PURE__ */ new Set([
   "x",
   "y",
@@ -11209,8 +11229,8 @@ function Group_doInitialPcbCalcPlacementResolution(group) {
   const inDegree = /* @__PURE__ */ new Map();
   const dependents = /* @__PURE__ */ new Map();
   for (const component of allNormalComponents) {
+    if (!shouldResolvePlacementInCalcPhase(component)) continue;
     const refs = getComponentRefsForCalcPlacement(component);
-    if (refs.size === 0) continue;
     if (!component.name) {
       throw new Error(
         `Invalid pcb position expression for ${component.getString()}: component-relative calc requires the component to have a name`
@@ -11221,29 +11241,24 @@ function Group_doInitialPcbCalcPlacementResolution(group) {
   }
   for (const [candidateName, candidate] of candidatesByName.entries()) {
     for (const token of candidate.refs) {
-      const { componentName, field } = parseComponentReferenceToken(token);
+      const { referencePath, field } = parseComponentReferenceToken(token);
       if (!SUPPORTED_COMPONENT_FIELDS.has(field)) {
         throw new Error(
           `Invalid pcb position expression for ${candidate.component.getString()}: unsupported component field "${field}" in "${token}"`
         );
       }
-      const referencedComponents = normalComponentNameMap.get(componentName);
-      if (!referencedComponents || referencedComponents.length === 0) {
-        throw new Error(
-          `Invalid pcb position expression for ${candidate.component.getString()}: unknown component reference "${componentName}" in "${token}"`
-        );
-      }
-      if (referencedComponents.length > 1) {
-        throw new Error(
-          `Invalid pcb position expression for ${candidate.component.getString()}: ambiguous component reference "${componentName}" in "${token}"`
-        );
-      }
-      if (candidatesByName.has(componentName) && componentName !== candidateName) {
+      const referencedComponentName = resolveReferencedComponentName({
+        token,
+        referencePath,
+        candidate,
+        normalComponentNameMap
+      });
+      if (candidatesByName.has(referencedComponentName) && referencedComponentName !== candidateName) {
         inDegree.set(candidateName, (inDegree.get(candidateName) ?? 0) + 1);
-        if (!dependents.has(componentName)) {
-          dependents.set(componentName, /* @__PURE__ */ new Set());
+        if (!dependents.has(referencedComponentName)) {
+          dependents.set(referencedComponentName, /* @__PURE__ */ new Set());
         }
-        dependents.get(componentName).add(candidateName);
+        dependents.get(referencedComponentName).add(candidateName);
       }
     }
   }
@@ -11275,6 +11290,23 @@ function Group_doInitialPcbCalcPlacementResolution(group) {
     if (!pcbComponent) return;
     const rawPcbX = component._parsedProps.pcbX;
     const rawPcbY = component._parsedProps.pcbY;
+    const rawComponentProps = component.props;
+    const rawPcbLeftEdgeX = component._parsedProps.pcbLeftEdgeX ?? rawComponentProps.pcbLeftEdgeX;
+    const rawPcbRightEdgeX = component._parsedProps.pcbRightEdgeX ?? rawComponentProps.pcbRightEdgeX;
+    const rawPcbTopEdgeY = component._parsedProps.pcbTopEdgeY ?? rawComponentProps.pcbTopEdgeY;
+    const rawPcbBottomEdgeY = component._parsedProps.pcbBottomEdgeY ?? rawComponentProps.pcbBottomEdgeY;
+    if (rawPcbLeftEdgeX !== void 0 && rawPcbRightEdgeX !== void 0) {
+      throw new Error(
+        `${component.componentName} cannot set both pcbLeftEdgeX and pcbRightEdgeX`
+      );
+    }
+    if (rawPcbTopEdgeY !== void 0 && rawPcbBottomEdgeY !== void 0) {
+      throw new Error(
+        `${component.componentName} cannot set both pcbTopEdgeY and pcbBottomEdgeY`
+      );
+    }
+    const componentWidth = pcbComponent.width ?? 0;
+    const componentHeight = pcbComponent.height ?? 0;
     const nextCenter = {
       x: pcbComponent.center.x,
       y: pcbComponent.center.y
@@ -11286,6 +11318,30 @@ function Group_doInitialPcbCalcPlacementResolution(group) {
       });
       component._resolvedPcbCalcOffsetX = resolvedPcbX;
       nextCenter.x = resolvedPcbX;
+    } else if (rawPcbLeftEdgeX !== void 0) {
+      const resolvedPcbLeftEdgeX = component.resolvePcbCoordinate(
+        rawPcbLeftEdgeX,
+        "pcbX",
+        {
+          allowComponentVariables: true,
+          componentVariables: componentVars
+        }
+      );
+      const resolvedPcbX = resolvedPcbLeftEdgeX + componentWidth / 2;
+      component._resolvedPcbCalcOffsetX = resolvedPcbX;
+      nextCenter.x = resolvedPcbX;
+    } else if (rawPcbRightEdgeX !== void 0) {
+      const resolvedPcbRightEdgeX = component.resolvePcbCoordinate(
+        rawPcbRightEdgeX,
+        "pcbX",
+        {
+          allowComponentVariables: true,
+          componentVariables: componentVars
+        }
+      );
+      const resolvedPcbX = resolvedPcbRightEdgeX - componentWidth / 2;
+      component._resolvedPcbCalcOffsetX = resolvedPcbX;
+      nextCenter.x = resolvedPcbX;
     }
     if (rawPcbY !== void 0) {
       const resolvedPcbY = component.resolvePcbCoordinate(rawPcbY, "pcbY", {
@@ -11294,11 +11350,49 @@ function Group_doInitialPcbCalcPlacementResolution(group) {
       });
       component._resolvedPcbCalcOffsetY = resolvedPcbY;
       nextCenter.y = resolvedPcbY;
+    } else if (rawPcbTopEdgeY !== void 0) {
+      const resolvedPcbTopEdgeY = component.resolvePcbCoordinate(
+        rawPcbTopEdgeY,
+        "pcbY",
+        {
+          allowComponentVariables: true,
+          componentVariables: componentVars
+        }
+      );
+      const resolvedPcbY = resolvedPcbTopEdgeY - componentHeight / 2;
+      component._resolvedPcbCalcOffsetY = resolvedPcbY;
+      nextCenter.y = resolvedPcbY;
+    } else if (rawPcbBottomEdgeY !== void 0) {
+      const resolvedPcbBottomEdgeY = component.resolvePcbCoordinate(
+        rawPcbBottomEdgeY,
+        "pcbY",
+        {
+          allowComponentVariables: true,
+          componentVariables: componentVars
+        }
+      );
+      const resolvedPcbY = resolvedPcbBottomEdgeY + componentHeight / 2;
+      component._resolvedPcbCalcOffsetY = resolvedPcbY;
+      nextCenter.y = resolvedPcbY;
     }
     component._repositionOnPcb(nextCenter);
     updateVarsForNamedComponent(component, componentVars);
   }
 }
+function shouldResolvePlacementInCalcPhase(component) {
+  const parsedProps = component._parsedProps;
+  const rawProps = component.props;
+  const pcbX = parsedProps.pcbX;
+  const pcbY = parsedProps.pcbY;
+  const pcbLeftEdgeX = parsedProps.pcbLeftEdgeX ?? rawProps.pcbLeftEdgeX;
+  const pcbRightEdgeX = parsedProps.pcbRightEdgeX ?? rawProps.pcbRightEdgeX;
+  const pcbTopEdgeY = parsedProps.pcbTopEdgeY ?? rawProps.pcbTopEdgeY;
+  const pcbBottomEdgeY = parsedProps.pcbBottomEdgeY ?? rawProps.pcbBottomEdgeY;
+  if (pcbLeftEdgeX !== void 0 || pcbRightEdgeX !== void 0 || pcbTopEdgeY !== void 0 || pcbBottomEdgeY !== void 0) {
+    return true;
+  }
+  return typeof pcbX === "string" || typeof pcbY === "string";
+}
 function collectNormalComponentsInSubcircuit(group) {
   const components = [];
   const walk = (node) => {
@@ -11318,6 +11412,11 @@ function getComponentRefsForCalcPlacement(component) {
   const refs = /* @__PURE__ */ new Set();
   const rawPcbX = component._parsedProps.pcbX;
   const rawPcbY = component._parsedProps.pcbY;
+  const rawComponentProps = component.props;
+  const rawPcbLeftEdgeX = component._parsedProps.pcbLeftEdgeX ?? rawComponentProps.pcbLeftEdgeX;
+  const rawPcbRightEdgeX = component._parsedProps.pcbRightEdgeX ?? rawComponentProps.pcbRightEdgeX;
+  const rawPcbTopEdgeY = component._parsedProps.pcbTopEdgeY ?? rawComponentProps.pcbTopEdgeY;
+  const rawPcbBottomEdgeY = component._parsedProps.pcbBottomEdgeY ?? rawComponentProps.pcbBottomEdgeY;
   const addRefs = (rawValue) => {
     if (typeof rawValue !== "string") return;
     const identifiers = extractCalcIdentifiers(rawValue);
@@ -11329,6 +11428,10 @@ function getComponentRefsForCalcPlacement(component) {
   };
   addRefs(rawPcbX);
   addRefs(rawPcbY);
+  addRefs(rawPcbLeftEdgeX);
+  addRefs(rawPcbRightEdgeX);
+  addRefs(rawPcbTopEdgeY);
+  addRefs(rawPcbBottomEdgeY);
   return refs;
 }
 function parseComponentReferenceToken(token) {
@@ -11337,10 +11440,35 @@ function parseComponentReferenceToken(token) {
     throw new Error(`Invalid component reference token: "${token}"`);
   }
   return {
-    componentName: token.slice(0, dotIndex),
+    referencePath: token.slice(0, dotIndex),
     field: token.slice(dotIndex + 1).toLowerCase()
   };
 }
+function resolveReferencedComponentName(params) {
+  const { token, referencePath, candidate, normalComponentNameMap } = params;
+  const directComponents = normalComponentNameMap.get(referencePath);
+  if (directComponents && directComponents.length > 0) {
+    if (directComponents.length > 1) {
+      throw new Error(
+        `Invalid pcb position expression for ${candidate.component.getString()}: ambiguous component reference "${referencePath}" in "${token}"`
+      );
+    }
+    return referencePath;
+  }
+  let bestMatch = null;
+  for (const componentName of normalComponentNameMap.keys()) {
+    if (!referencePath.startsWith(`${componentName}.`)) continue;
+    if (!bestMatch || componentName.length > bestMatch.length) {
+      bestMatch = componentName;
+    }
+  }
+  if (!bestMatch) {
+    throw new Error(
+      `Invalid pcb position expression for ${candidate.component.getString()}: unknown component reference "${referencePath}" in "${token}"`
+    );
+  }
+  return bestMatch;
+}
 function updateVarsForNamedComponent(component, vars) {
   if (!component.name || !component.pcb_component_id || !component.root) return;
   const pcbComponent = component.root.db.pcb_component.get(
@@ -11359,6 +11487,58 @@ function updateVarsForNamedComponent(component, vars) {
   vars[`${component.name}.maxx`] = x + width / 2;
   vars[`${component.name}.miny`] = y - height / 2;
   vars[`${component.name}.maxy`] = y + height / 2;
+  const padElementsByReference = collectPadElementsByReference(component);
+  for (const [referencePath, elements] of padElementsByReference.entries()) {
+    const bounds = getBoundsOfPcbElements(elements);
+    const minX = bounds.minX;
+    const maxX = bounds.maxX;
+    const minY = bounds.minY;
+    const maxY = bounds.maxY;
+    vars[`${referencePath}.x`] = (minX + maxX) / 2;
+    vars[`${referencePath}.y`] = (minY + maxY) / 2;
+    vars[`${referencePath}.width`] = maxX - minX;
+    vars[`${referencePath}.height`] = maxY - minY;
+    vars[`${referencePath}.minx`] = minX;
+    vars[`${referencePath}.maxx`] = maxX;
+    vars[`${referencePath}.miny`] = minY;
+    vars[`${referencePath}.maxy`] = maxY;
+  }
+}
+function collectPadElementsByReference(component) {
+  const refsToElements = /* @__PURE__ */ new Map();
+  if (!component.name || !component.pcb_component_id || !component.root) {
+    return refsToElements;
+  }
+  const { db } = component.root;
+  const padElements = [
+    ...db.pcb_smtpad.list({ pcb_component_id: component.pcb_component_id }),
+    ...db.pcb_plated_hole.list({
+      pcb_component_id: component.pcb_component_id
+    })
+  ];
+  for (const pad of padElements) {
+    const aliases = /* @__PURE__ */ new Set();
+    for (const hint of pad.port_hints ?? []) {
+      if (typeof hint === "string" && hint.length > 0) aliases.add(hint);
+    }
+    const pcbPortId = pad.pcb_port_id;
+    if (pcbPortId) {
+      const pcbPort = db.pcb_port.get(pcbPortId);
+      const sourcePort = pcbPort?.source_port_id ? db.source_port.get(pcbPort.source_port_id) : null;
+      if (sourcePort?.name) aliases.add(sourcePort.name);
+      if (sourcePort?.pin_number != null) {
+        aliases.add(`pin${sourcePort.pin_number}`);
+      }
+    }
+    for (const alias of aliases) {
+      const referencePath = `${component.name}.${alias}`;
+      if (!refsToElements.has(referencePath)) {
+        refsToElements.set(referencePath, []);
+      }
+      refsToElements.get(referencePath).push(pad);
+    }
+  }
+  return refsToElements;
 }
 
 // lib/components/primitive-components/Group/Group_doInitialPcbComponentAnchorAlignment.ts
@@ -12351,7 +12531,7 @@ import { identity as identity4 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1028",
+  version: "0.0.1030",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -15963,6 +16143,7 @@ var Group = class extends NormalComponent3 {
   }
   _getPcbLayoutMode() {
     const props = this._parsedProps;
+    const rawProps = this.props;
     if (this._isInflatedFromCircuitJson) return "none";
     if (props.pcbRelative) return "none";
     if (props.pcbLayout?.matchAdapt) return "match-adapt";
@@ -15976,7 +16157,7 @@ var Group = class extends NormalComponent3 {
     if (props.matchAdapt) return "match-adapt";
     if (props.flex) return "flex";
     if (props.grid) return "grid";
-    const groupHasCoords = props.pcbX !== void 0 || props.pcbY !== void 0;
+    const groupHasCoords = props.pcbX !== void 0 || props.pcbY !== void 0 || props.pcbLeftEdgeX !== void 0 || props.pcbRightEdgeX !== void 0 || props.pcbTopEdgeY !== void 0 || props.pcbBottomEdgeY !== void 0 || rawProps.pcbLeftEdgeX !== void 0 || rawProps.pcbRightEdgeX !== void 0 || rawProps.pcbTopEdgeY !== void 0 || rawProps.pcbBottomEdgeY !== void 0;
     const hasManualEdits = (props.manualEdits?.pcb_placements?.length ?? 0) > 0;
     const unpositionedDirectChildrenCount = this.children.reduce(
       (count, child) => {
@@ -15984,7 +16165,8 @@ var Group = class extends NormalComponent3 {
           return count;
         }
         const childProps = child._parsedProps;
-        const hasCoords = childProps?.pcbX !== void 0 || childProps?.pcbY !== void 0;
+        const rawChildProps = child.props;
+        const hasCoords = childProps?.pcbX !== void 0 || childProps?.pcbY !== void 0 || childProps?.pcbLeftEdgeX !== void 0 || childProps?.pcbRightEdgeX !== void 0 || childProps?.pcbTopEdgeY !== void 0 || childProps?.pcbBottomEdgeY !== void 0 || rawChildProps?.pcbLeftEdgeX !== void 0 || rawChildProps?.pcbRightEdgeX !== void 0 || rawChildProps?.pcbTopEdgeY !== void 0 || rawChildProps?.pcbBottomEdgeY !== void 0;
         return count + (hasCoords ? 0 : 1);
       },
       0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1029",
+  "version": "0.0.1031",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",