@tscircuit/core 0.0.1099 → 0.0.1101

package/dist/index.d.ts

@@ -497,6 +497,7 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
     schematic_component_id: string | null;
     pcb_component_id: string | null;
     cad_component_id: string | null;
+    _reportedInvalidPcbCalcWarnings: Set<string>;
     fallbackUnassignedName?: string;
     constructor(props: z.input<ZodProps>);
     setProps(props: Partial<z.input<ZodProps>>): void;

package/dist/index.js

@@ -840,6 +840,42 @@ function parseExpression(tokens, vars) {
   return result;
 }
 
+// lib/utils/getSubcircuitPcbCalcVariables.ts
+function setSubcircuitPcbComponentCalcVariables(params) {
+  const { vars, componentName, position, size } = params;
+  vars[`${componentName}.x`] = position.x;
+  vars[`${componentName}.y`] = position.y;
+  vars[`${componentName}.width`] = size.width;
+  vars[`${componentName}.height`] = size.height;
+  vars[`${componentName}.minX`] = position.x - size.width / 2;
+  vars[`${componentName}.maxX`] = position.x + size.width / 2;
+  vars[`${componentName}.minY`] = position.y - size.height / 2;
+  vars[`${componentName}.maxY`] = position.y + size.height / 2;
+}
+function getSubcircuitPcbCalcVariables(db) {
+  const vars = {};
+  for (const sourceComponent of db.source_component.list()) {
+    if (!sourceComponent.name) continue;
+    const pcbComponent = db.pcb_component.getWhere({
+      source_component_id: sourceComponent.source_component_id
+    });
+    if (!pcbComponent) continue;
+    setSubcircuitPcbComponentCalcVariables({
+      vars,
+      componentName: sourceComponent.name,
+      position: {
+        x: pcbComponent.center.x,
+        y: pcbComponent.center.y
+      },
+      size: {
+        width: pcbComponent.width ?? 0,
+        height: pcbComponent.height ?? 0
+      }
+    });
+  }
+  return vars;
+}
+
 // lib/utils/pcbSx/convert-pcb-style-to-pcb-sx.ts
 function convertPcbStyleToPcbSx(pcbStyle) {
   if (!pcbStyle) return void 0;
@@ -1163,6 +1199,7 @@ var PrimitiveComponent2 = class extends Renderable {
   schematic_component_id = null;
   pcb_component_id = null;
   cad_component_id = null;
+  _reportedInvalidPcbCalcWarnings = /* @__PURE__ */ new Set();
   fallbackUnassignedName;
   constructor(props) {
     super(props);
@@ -1221,7 +1258,8 @@ var PrimitiveComponent2 = class extends Renderable {
       );
     }
     const allowBoardVariables = options.allowBoardVariables ?? this._shouldAllowBoardVariablesByDefault();
-    const allowComponentVariables = options.allowComponentVariables ?? false;
+    const isNormalComponent = this._isNormalComponent === true;
+    const allowComponentVariables = options.allowComponentVariables ?? (!isNormalComponent && !this._isInsideFootprint());
     const includesBoardVariable = rawValue.includes("board.");
     const knownVariables = {};
     if (allowBoardVariables) {
@@ -1240,6 +1278,10 @@ var PrimitiveComponent2 = class extends Renderable {
       Object.assign(knownVariables, boardVariables);
     }
     if (allowComponentVariables) {
+      const db = this.root?.db;
+      if (db) {
+        Object.assign(knownVariables, getSubcircuitPcbCalcVariables(db));
+      }
       Object.assign(knownVariables, options.componentVariables ?? {});
     }
     try {
@@ -1248,6 +1290,15 @@ var PrimitiveComponent2 = class extends Renderable {
         (identifier) => !identifier.startsWith("board.")
       );
       if (includesComponentVariable && !allowComponentVariables) {
+        if (this._isInsideFootprint() && this.root && !this._reportedInvalidPcbCalcWarnings.has(axis)) {
+          this.root.db.source_invalid_component_property_error.insert({
+            source_component_id: this.source_component_id || "",
+            property_name: axis,
+            message: `component-relative calc references are not supported for footprint elements (${this.componentName}); ${axis} will be ignored. expression="${rawValue}"`,
+            error_type: "source_invalid_component_property_error"
+          });
+          this._reportedInvalidPcbCalcWarnings.add(axis);
+        }
         return 0;
       }
       return evaluateCalcString(rawValue, { knownVariables });
@@ -13109,14 +13160,12 @@ function updateVarsForNamedComponent(component, vars) {
   const height = pcbComponent.height ?? 0;
   const x = pcbComponent.center.x;
   const y = pcbComponent.center.y;
-  vars[`${component.name}.x`] = x;
-  vars[`${component.name}.y`] = y;
-  vars[`${component.name}.width`] = width;
-  vars[`${component.name}.height`] = height;
-  vars[`${component.name}.minX`] = x - width / 2;
-  vars[`${component.name}.maxX`] = x + width / 2;
-  vars[`${component.name}.minY`] = y - height / 2;
-  vars[`${component.name}.maxY`] = y + height / 2;
+  setSubcircuitPcbComponentCalcVariables({
+    vars,
+    componentName: component.name,
+    position: { x, y },
+    size: { width, height }
+  });
   const padElementsByReference = collectPadElementsByReference(component);
   for (const [referencePath, elements] of padElementsByReference.entries()) {
     const bounds = getBoundsOfPcbElements(elements);
@@ -18211,7 +18260,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1098",
+  version: "0.0.1100",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -18270,7 +18319,7 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.393",
+    "circuit-json": "^0.0.397",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.73",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1099",
+  "version": "0.0.1101",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -60,7 +60,7 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.393",
+    "circuit-json": "^0.0.397",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.73",