@tscircuit/core 0.0.889 → 0.0.890

package/dist/index.js

@@ -479,6 +479,182 @@ import {
 import { z } from "zod";
 import { selectOne, selectAll } from "css-select";
 
+// lib/utils/evaluateCalcString.ts
+var defaultUnits = {
+  mm: 1
+  // You can add more if you need them:
+  // cm: 10,
+  // in: 25.4,
+  // mil: 0.0254,
+};
+function evaluateCalcString(input, options) {
+  const { knownVariables, units: userUnits } = options;
+  const units = { ...defaultUnits, ...userUnits ?? {} };
+  const expr = extractExpression(input);
+  const tokens = tokenize(expr, units);
+  const result = parseExpression(tokens, knownVariables);
+  return result;
+}
+function extractExpression(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed.toLowerCase().startsWith("calc")) {
+    return trimmed;
+  }
+  const match = trimmed.match(/^calc\s*\((.*)\)$/is);
+  if (!match) {
+    throw new Error(`Invalid calc() expression: "${raw}"`);
+  }
+  return match[1].trim();
+}
+function tokenize(expr, units) {
+  const tokens = [];
+  let i = 0;
+  const isDigit = (ch) => ch >= "0" && ch <= "9";
+  const isIdentStart = (ch) => ch >= "A" && ch <= "Z" || ch >= "a" && ch <= "z" || ch === "_";
+  const isIdentChar = (ch) => isIdentStart(ch) || isDigit(ch) || ch === ".";
+  while (i < expr.length) {
+    const ch = expr[i];
+    if (ch === " " || ch === "	" || ch === "\n" || ch === "\r") {
+      i++;
+      continue;
+    }
+    if (isDigit(ch) || ch === "." && i + 1 < expr.length && isDigit(expr[i + 1])) {
+      const start = i;
+      i++;
+      while (i < expr.length) {
+        const c = expr[i];
+        if (isDigit(c) || c === ".") {
+          i++;
+        } else {
+          break;
+        }
+      }
+      const numberText = expr.slice(start, i);
+      let num = Number(numberText);
+      if (Number.isNaN(num)) {
+        throw new Error(`Invalid number: "${numberText}"`);
+      }
+      const unitStart = i;
+      while (i < expr.length && /[A-Za-z]/.test(expr[i])) {
+        i++;
+      }
+      if (i > unitStart) {
+        const unitText = expr.slice(unitStart, i);
+        const factor = units[unitText];
+        if (factor == null) {
+          throw new Error(`Unknown unit: "${unitText}"`);
+        }
+        num *= factor;
+      }
+      tokens.push({ type: "number", value: num });
+      continue;
+    }
+    if (isIdentStart(ch)) {
+      const start = i;
+      i++;
+      while (i < expr.length && isIdentChar(expr[i])) {
+        i++;
+      }
+      const ident = expr.slice(start, i);
+      tokens.push({ type: "identifier", value: ident });
+      continue;
+    }
+    if (ch === "(" || ch === ")") {
+      tokens.push({ type: "paren", value: ch });
+      i++;
+      continue;
+    }
+    if (ch === "+" || ch === "-" || ch === "*" || ch === "/") {
+      tokens.push({ type: "operator", value: ch });
+      i++;
+      continue;
+    }
+    throw new Error(`Unexpected character "${ch}" in expression "${expr}"`);
+  }
+  return tokens;
+}
+function parseExpression(tokens, vars) {
+  let index = 0;
+  const peek = () => tokens[index];
+  const consume = () => tokens[index++];
+  const parsePrimary = () => {
+    const token = peek();
+    if (!token) {
+      throw new Error("Unexpected end of expression");
+    }
+    if (token.type === "number") {
+      consume();
+      return token.value;
+    }
+    if (token.type === "identifier") {
+      consume();
+      const value = vars[token.value];
+      if (value == null) {
+        throw new Error(`Unknown variable: "${token.value}"`);
+      }
+      return value;
+    }
+    if (token.type === "paren" && token.value === "(") {
+      consume();
+      const value = parseExpr();
+      const next = peek();
+      if (!next || next.type !== "paren" || next.value !== ")") {
+        throw new Error('Expected ")"');
+      }
+      consume();
+      return value;
+    }
+    throw new Error(`Unexpected token "${token.value}"`);
+  };
+  const parseFactor = () => {
+    const token = peek();
+    if (token && token.type === "operator" && (token.value === "+" || token.value === "-")) {
+      consume();
+      const value = parseFactor();
+      return token.value === "+" ? value : -value;
+    }
+    return parsePrimary();
+  };
+  const parseTerm = () => {
+    let value = parseFactor();
+    while (true) {
+      const token = peek();
+      if (!token || token.type !== "operator") break;
+      if (token.value !== "*" && token.value !== "/") break;
+      consume();
+      const rhs = parseFactor();
+      if (token.value === "*") {
+        value *= rhs;
+      } else {
+        value /= rhs;
+      }
+    }
+    return value;
+  };
+  const parseExpr = () => {
+    let value = parseTerm();
+    while (true) {
+      const token = peek();
+      if (!token || token.type !== "operator") break;
+      if (token.value !== "+" && token.value !== "-") break;
+      consume();
+      const rhs = parseTerm();
+      if (token.value === "+") {
+        value += rhs;
+      } else {
+        value -= rhs;
+      }
+    }
+    return value;
+  };
+  const result = parseExpr();
+  if (index < tokens.length) {
+    const leftover = tokens.slice(index).map((t) => "value" in t ? t.value : "?").join(" ");
+    throw new Error(`Unexpected tokens at end of expression: ${leftover}`);
+  }
+  return result;
+}
+
 // lib/components/base-components/PrimitiveComponent/cssSelectPrimitiveComponentAdapter.ts
 var cssSelectPrimitiveComponentAdapter = {
   // Is the node an element?
@@ -756,15 +932,56 @@ var PrimitiveComponent2 = class extends Renderable {
     }
     return pcbRotation ?? null;
   }
+  getResolvedPcbPositionProp() {
+    return {
+      pcbX: this._resolvePcbCoordinate(this._parsedProps.pcbX, "pcbX"),
+      pcbY: this._resolvePcbCoordinate(this._parsedProps.pcbY, "pcbY")
+    };
+  }
+  _resolvePcbCoordinate(rawValue, axis, options = {}) {
+    if (rawValue == null) return 0;
+    if (typeof rawValue === "number") return rawValue;
+    if (typeof rawValue !== "string") {
+      throw new Error(
+        `Invalid ${axis} value for ${this.componentName}: ${String(rawValue)}`
+      );
+    }
+    const allowBoardVariables = options.allowBoardVariables ?? this._isNormalComponent === true;
+    const includesBoardVariable = rawValue.includes("board.");
+    const knownVariables = {};
+    if (allowBoardVariables) {
+      const board = this._getBoard();
+      const boardVariables = board?._getBoardCalcVariables() ?? {};
+      if (includesBoardVariable && !board) {
+        throw new Error(
+          `Cannot resolve ${axis} for ${this.componentName}: no board found for board.* variables`
+        );
+      }
+      if (includesBoardVariable && board && Object.keys(boardVariables).length === 0) {
+        throw new Error(
+          "Cannot do calculations based on board size when the board is auto-sized"
+        );
+      }
+      Object.assign(knownVariables, boardVariables);
+    }
+    try {
+      return evaluateCalcString(rawValue, { knownVariables });
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new Error(
+        `Invalid ${axis} value for ${this.componentName}: ${message}`
+      );
+    }
+  }
   /**
    * Computes a transformation matrix from the props of this component for PCB
    * components
    */
   computePcbPropsTransform() {
-    const { _parsedProps: props } = this;
     const rotation4 = this._getPcbRotationBeforeLayout() ?? 0;
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const matrix = compose(
-      translate(props.pcbX ?? 0, props.pcbY ?? 0),
+      translate(pcbX, pcbY),
       rotate(rotation4 * Math.PI / 180)
     );
     return matrix;
@@ -1021,6 +1238,17 @@ var PrimitiveComponent2 = class extends Renderable {
   _getGlobalSchematicPositionBeforeLayout() {
     return applyToPoint(this.computeSchematicGlobalTransform(), { x: 0, y: 0 });
   }
+  _getBoard() {
+    let current = this;
+    while (current) {
+      const maybePrimitive = current;
+      if (maybePrimitive.componentName === "Board") {
+        return maybePrimitive;
+      }
+      current = current.parent ?? null;
+    }
+    return this.root?._getBoard();
+  }
   get root() {
     return this.parent?.root ?? null;
   }
@@ -1237,7 +1465,7 @@ var PrimitiveComponent2 = class extends Renderable {
         return this._parsedProps.layers;
       }
       if (this.componentName === "PlatedHole") {
-        return this.root?._getBoard()?.allLayers ?? ["top", "bottom"];
+        return [...this.root?._getBoard()?.allLayers ?? ["top", "bottom"]];
       }
       return [];
     }
@@ -1353,6 +1581,19 @@ import { z as z2 } from "zod";
 var ErrorPlaceholderComponent = class extends PrimitiveComponent2 {
   constructor(props, error) {
     super(props);
+    const resolveCoordinate = (value, axis) => {
+      if (typeof value === "number") return value;
+      if (typeof value === "string") {
+        try {
+          return this._resolvePcbCoordinate(value, axis, {
+            allowBoardVariables: false
+          });
+        } catch (err) {
+          return 0;
+        }
+      }
+      return 0;
+    };
     this._parsedProps = {
       ...props,
       error,
@@ -1360,8 +1601,8 @@ var ErrorPlaceholderComponent = class extends PrimitiveComponent2 {
       component_name: props.name,
       error_type: "source_failed_to_create_component_error",
       message: error instanceof Error ? error.message : String(error),
-      pcbX: props.pcbX,
-      pcbY: props.pcbY,
+      pcbX: resolveCoordinate(props.pcbX, "pcbX"),
+      pcbY: resolveCoordinate(props.pcbY, "pcbY"),
       schX: props.schX,
       schY: props.schY
     };
@@ -4791,9 +5032,10 @@ var CadModel = class extends PrimitiveComponent2 {
       rotationOffset.y = Number(parsed.y);
       rotationOffset.z = Number(parsed.z);
     }
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const positionOffset = point3.parse({
-      x: props.pcbX ?? 0,
-      y: props.pcbY ?? 0,
+      x: pcbX,
+      y: pcbY,
       z: props.pcbZ ?? 0,
       ...typeof props.positionOffset === "object" ? props.positionOffset : {}
     });
@@ -14330,6 +14572,12 @@ var Board = class extends Group6 {
   }
   get boardThickness() {
     const { _parsedProps: props } = this;
+    const pcbX = this._resolvePcbCoordinate(props.pcbX, "pcbX", {
+      allowBoardVariables: false
+    });
+    const pcbY = this._resolvePcbCoordinate(props.pcbY, "pcbY", {
+      allowBoardVariables: false
+    });
     return props.thickness ?? 1.4;
   }
   /**
@@ -14345,11 +14593,45 @@ var Board = class extends Group6 {
   _getSubcircuitLayerCount() {
     return this._parsedProps.layers ?? 2;
   }
+  _getBoardCalcVariables() {
+    const { _parsedProps: props } = this;
+    const isAutoSized = (props.width == null || props.height == null) && !props.outline;
+    if (isAutoSized) return {};
+    const dbBoard = this.pcb_board_id ? this.root?.db.pcb_board.get(this.pcb_board_id) : null;
+    let width = dbBoard?.width ?? props.width;
+    let height = dbBoard?.height ?? props.height;
+    if ((width == null || height == null) && props.outline?.length) {
+      const outlineBounds = getBoundsFromPoints4(props.outline);
+      if (outlineBounds) {
+        width ??= outlineBounds.maxX - outlineBounds.minX;
+        height ??= outlineBounds.maxY - outlineBounds.minY;
+      }
+    }
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
+    const center = dbBoard?.center ?? {
+      x: pcbX + (props.outlineOffsetX ?? 0),
+      y: pcbY + (props.outlineOffsetY ?? 0)
+    };
+    const resolvedWidth = width ?? 0;
+    const resolvedHeight = height ?? 0;
+    return {
+      "board.minx": center.x - resolvedWidth / 2,
+      "board.maxx": center.x + resolvedWidth / 2,
+      "board.miny": center.y - resolvedHeight / 2,
+      "board.maxy": center.y + resolvedHeight / 2
+    };
+  }
   doInitialPcbBoardAutoSize() {
     if (this.root?.pcbDisabled) return;
     if (!this.pcb_board_id) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
+    const pcbX = this._resolvePcbCoordinate(props.pcbX, "pcbX", {
+      allowBoardVariables: false
+    });
+    const pcbY = this._resolvePcbCoordinate(props.pcbY, "pcbY", {
+      allowBoardVariables: false
+    });
     if (props.width && props.height || props.outline) return;
     let minX = Infinity;
     let minY = Infinity;
@@ -14398,8 +14680,8 @@ var Board = class extends Group6 {
     const computedWidth = hasComponents ? maxX - minX + padding * 2 : 0;
     const computedHeight = hasComponents ? maxY - minY + padding * 2 : 0;
     const center = {
-      x: hasComponents ? (minX + maxX) / 2 + (props.outlineOffsetX ?? 0) : props.outlineOffsetX ?? 0,
-      y: hasComponents ? (minY + maxY) / 2 + (props.outlineOffsetY ?? 0) : props.outlineOffsetY ?? 0
+      x: hasComponents ? (minX + maxX) / 2 + (props.outlineOffsetX ?? 0) : (props.outlineOffsetX ?? 0) + pcbX,
+      y: hasComponents ? (minY + maxY) / 2 + (props.outlineOffsetY ?? 0) : (props.outlineOffsetY ?? 0) + pcbY
     };
     const finalWidth = props.width ?? computedWidth;
     const finalHeight = props.height ?? computedHeight;
@@ -14475,9 +14757,10 @@ var Board = class extends Group6 {
     const { _parsedProps: props } = this;
     let computedWidth = props.width ?? 0;
     let computedHeight = props.height ?? 0;
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     let center = {
-      x: (props.pcbX ?? 0) + (props.outlineOffsetX ?? 0),
-      y: (props.pcbY ?? 0) + (props.outlineOffsetY ?? 0)
+      x: pcbX + (props.outlineOffsetX ?? 0),
+      y: pcbY + (props.outlineOffsetY ?? 0)
     };
     const { boardAnchorPosition, boardAnchorAlignment } = props;
     if (boardAnchorPosition) {
@@ -15122,6 +15405,7 @@ var Chip = class extends NormalComponent3 {
   initPorts(opts = {}) {
     super.initPorts(opts);
     const { _parsedProps: props } = this;
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     if (props.externallyConnectedPins) {
       const requiredPorts = /* @__PURE__ */ new Set();
       for (const [pin1, pin2] of props.externallyConnectedPins) {
@@ -15162,6 +15446,7 @@ var Chip = class extends NormalComponent3 {
   doInitialSourceRender() {
     const { db } = this.root;
     const { _parsedProps: props } = this;
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const source_component = db.source_component.insert({
       ftype: "simple_chip",
       name: this.name,
@@ -15174,6 +15459,7 @@ var Chip = class extends NormalComponent3 {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const componentLayer = props.layer ?? "top";
     if (componentLayer !== "top" && componentLayer !== "bottom") {
       const subcircuit = this.getSubcircuit();
@@ -15187,7 +15473,7 @@ var Chip = class extends NormalComponent3 {
       db.pcb_component_invalid_layer_error.insert(error);
     }
     const pcb_component = db.pcb_component.insert({
-      center: { x: props.pcbX ?? 0, y: props.pcbY ?? 0 },
+      center: { x: pcbX, y: pcbY },
       width: 2,
       // Default width, adjust as needed
       height: 3,
@@ -15398,6 +15684,7 @@ var Jumper = class extends NormalComponent3 {
   doInitialSourceRender() {
     const { db } = this.root;
     const { _parsedProps: props } = this;
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const source_component = db.source_component.insert({
       ftype: "simple_chip",
       // TODO unknown or jumper
@@ -15412,8 +15699,9 @@ var Jumper = class extends NormalComponent3 {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const pcb_component = db.pcb_component.insert({
-      center: { x: props.pcbX ?? 0, y: props.pcbY ?? 0 },
+      center: { x: pcbX, y: pcbY },
       width: 2,
       // Default width, adjust as needed
       height: 3,
@@ -15554,6 +15842,7 @@ var SolderJumper = class extends NormalComponent3 {
   doInitialSourceRender() {
     const { db } = this.root;
     const { _parsedProps: props } = this;
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const source_component = db.source_component.insert({
       ftype: "simple_chip",
       // TODO unknown or jumper
@@ -15568,8 +15857,9 @@ var SolderJumper = class extends NormalComponent3 {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const pcb_component = db.pcb_component.insert({
-      center: { x: props.pcbX ?? 0, y: props.pcbY ?? 0 },
+      center: { x: pcbX, y: pcbY },
       width: 2,
       // Default width, adjust as needed
       height: 3,
@@ -15953,6 +16243,7 @@ var FabricationNoteRect = class extends PrimitiveComponent2 {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const { maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
     const layer = maybeFlipLayer(props.layer ?? "top");
     if (layer !== "top" && layer !== "bottom") {
@@ -15968,8 +16259,8 @@ var FabricationNoteRect = class extends PrimitiveComponent2 {
       layer,
       color: props.color,
       center: {
-        x: props.pcbX ?? 0,
-        y: props.pcbY ?? 0
+        x: pcbX,
+        y: pcbY
       },
       width: props.width,
       height: props.height,
@@ -16048,13 +16339,14 @@ var FabricationNoteText = class extends PrimitiveComponent2 {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const container = this.getPrimitiveContainer();
     const subcircuit = this.getSubcircuit();
     db.pcb_fabrication_note_text.insert({
       anchor_alignment: props.anchorAlignment,
       anchor_position: {
-        x: props.pcbX ?? 0,
-        y: props.pcbY ?? 0
+        x: pcbX,
+        y: pcbY
       },
       font: props.font ?? "tscircuit2024",
       font_size: props.fontSize ?? 1,
@@ -17035,7 +17327,7 @@ var BreakoutPoint = class extends PrimitiveComponent2 {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     this._matchConnection();
-    const { pcbX = 0, pcbY = 0 } = this._parsedProps;
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const group = this.parent?.getGroup();
     const subcircuit = this.getSubcircuit();
     if (!group || !group.pcb_group_id) return;
@@ -17051,7 +17343,7 @@ var BreakoutPoint = class extends PrimitiveComponent2 {
     this.pcb_breakout_point_id = pcb_breakout_point.pcb_breakout_point_id;
   }
   _getPcbCircuitJsonBounds() {
-    const { pcbX = 0, pcbY = 0 } = this._parsedProps;
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     return {
       center: { x: pcbX, y: pcbY },
       bounds: { left: pcbX, top: pcbY, right: pcbX, bottom: pcbY },
@@ -17286,6 +17578,7 @@ var SilkscreenCircle = class extends PrimitiveComponent2 {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const { maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
     const layer = maybeFlipLayer(props.layer ?? "top");
     if (layer !== "top" && layer !== "bottom") {
@@ -17300,8 +17593,8 @@ var SilkscreenCircle = class extends PrimitiveComponent2 {
       pcb_component_id,
       layer,
       center: {
-        x: props.pcbX ?? 0,
-        y: props.pcbY ?? 0
+        x: pcbX,
+        y: pcbY
       },
       radius: props.radius,
       subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
@@ -17340,13 +17633,14 @@ var SilkscreenRect = class extends PrimitiveComponent2 {
       );
     }
     const subcircuit = this.getSubcircuit();
+    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id;
     const pcb_silkscreen_rect = db.pcb_silkscreen_rect.insert({
       pcb_component_id,
       layer,
       center: {
-        x: props.pcbX ?? 0,
-        y: props.pcbY ?? 0
+        x: pcbX,
+        y: pcbY
       },
       width: props.width,
       height: props.height,
@@ -18866,7 +19160,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.888",
+  version: "0.0.889",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -18910,7 +19204,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.29",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.4",
-    "@tscircuit/props": "^0.0.419",
+    "@tscircuit/props": "^0.0.421",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.889",
+  "version": "0.0.890",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -45,7 +45,7 @@
     "@tscircuit/math-utils": "^0.0.29",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.4",
-    "@tscircuit/props": "^0.0.419",
+    "@tscircuit/props": "^0.0.421",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",