@tscircuit/core 0.0.1033 → 0.0.1035

package/dist/index.js

@@ -651,16 +651,28 @@ var defaultUnits = {
 function evaluateCalcString(input, options) {
   const { knownVariables, units: userUnits } = options;
   const units = { ...defaultUnits, ...userUnits ?? {} };
-  const expr = extractExpression(input);
+  const expr = normalizeLegacyBoundsIdentifierCase(extractExpression(input));
   const tokens = tokenize(expr, units);
   const result = parseExpression(tokens, knownVariables);
   return result;
 }
 function extractCalcIdentifiers(input) {
-  const expr = extractExpression(input);
+  const expr = normalizeLegacyBoundsIdentifierCase(extractExpression(input));
   const tokens = tokenize(expr, defaultUnits);
   return tokens.filter((token) => token.type === "identifier").map((token) => token.value);
 }
+function normalizeLegacyBoundsIdentifierCase(expr) {
+  const legacyBoundNameToCamelCase = {
+    minx: "minX",
+    maxx: "maxX",
+    miny: "minY",
+    maxy: "maxY"
+  };
+  return expr.replace(/\.(minx|maxx|miny|maxy)\b/gi, (match, boundName) => {
+    const normalizedBoundName = legacyBoundNameToCamelCase[String(boundName).toLowerCase()];
+    return `.${normalizedBoundName ?? match.slice(1)}`;
+  });
+}
 function extractExpression(raw) {
   const trimmed = raw.trim();
   if (!trimmed.toLowerCase().startsWith("calc")) {
@@ -11487,10 +11499,10 @@ function updateVarsForNamedComponent(component, vars) {
   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;
+  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;
   const padElementsByReference = collectPadElementsByReference(component);
   for (const [referencePath, elements] of padElementsByReference.entries()) {
     const bounds = getBoundsOfPcbElements(elements);
@@ -11502,10 +11514,10 @@ function updateVarsForNamedComponent(component, vars) {
     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;
+    vars[`${referencePath}.minX`] = minX;
+    vars[`${referencePath}.maxX`] = maxX;
+    vars[`${referencePath}.minY`] = minY;
+    vars[`${referencePath}.maxY`] = maxY;
   }
 }
 function collectPadElementsByReference(component) {
@@ -12535,7 +12547,7 @@ import { identity as identity4 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1032",
+  version: "0.0.1034",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -13467,6 +13479,21 @@ function rotateDirection(direction, degrees) {
   const newIndex = (currentIndex + steps) % 4;
   return directions[newIndex < 0 ? newIndex + 4 : newIndex];
 }
+function isTreeChildExplicitlyPositioned(treeChild, group) {
+  if (treeChild.nodeType === "component" && treeChild.sourceComponent) {
+    const component = group.children.find(
+      (groupChild) => groupChild.source_component_id === treeChild.sourceComponent?.source_component_id
+    );
+    return component?._parsedProps?.schX !== void 0 || component?._parsedProps?.schY !== void 0;
+  }
+  if (treeChild.nodeType === "group" && treeChild.sourceGroup) {
+    const nestedGroup = group.children.find(
+      (groupChild) => groupChild.source_group_id === treeChild.sourceGroup?.source_group_id
+    );
+    return nestedGroup?._parsedProps?.schX !== void 0 || nestedGroup?._parsedProps?.schY !== void 0;
+  }
+  return false;
+}
 function convertTreeToInputProblem(tree, db, group) {
   const problem = {
     chipMap: {},
@@ -13482,6 +13509,12 @@ function convertTreeToInputProblem(tree, db, group) {
     `[${group.name}] Processing ${tree.childNodes.length} child nodes for input problem`
   );
   tree.childNodes.forEach((child, index) => {
+    if (isTreeChildExplicitlyPositioned(child, group)) {
+      debug6(
+        `[${group.name}] Skipping explicitly positioned child ${index} from matchpack`
+      );
+      return;
+    }
     debug6(
       `[${group.name}] Processing child ${index}: nodeType=${child.nodeType}`
     );
@@ -16099,6 +16132,7 @@ var Group = class extends NormalComponent3 {
   }
   _getSchematicLayoutMode() {
     const props = this._parsedProps;
+    const schAutoLayoutEnabled = props.schAutoLayoutEnabled ?? false;
     if (props.schLayout?.layoutMode === "none") return "relative";
     if (props.schLayout?.layoutMode === "relative") return "relative";
     if (props.schLayout?.matchAdapt) return "match-adapt";
@@ -16117,6 +16151,7 @@ var Group = class extends NormalComponent3 {
       return cProps?.schX !== void 0 || cProps?.schY !== void 0;
     });
     const hasManualEdits = (props.manualEdits?.schematic_placements?.length ?? 0) > 0;
+    if (schAutoLayoutEnabled && !hasManualEdits) return "match-adapt";
     if (!anyChildHasSchCoords && !hasManualEdits) return "match-adapt";
     return "relative";
   }
@@ -17541,10 +17576,10 @@ var Board = class extends Group {
     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
+      "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() {

package/package.json

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