@tscircuit/core 0.0.1434 → 0.0.1436

package/dist/index.js

@@ -39,7 +39,7 @@ __export(components_exports, {
   Fiducial: () => Fiducial,
   Footprint: () => Footprint,
   Fuse: () => Fuse,
-  Group: () => Group5,
+  Group: () => Group,
   Hole: () => Hole,
   Inductor: () => Inductor,
   Interconnect: () => Interconnect,
@@ -18981,8 +18981,48 @@ function Group_doInitialSchematicLayoutMatchAdapt(group) {
 // lib/components/primitive-components/Group/applySchematicMatchPackLayoutToTree.ts
 import "@tscircuit/circuit-json-util";
 import { LayoutPipelineSolver } from "@tscircuit/matchpack";
+import { getBoundFromCenteredRect as getBoundFromCenteredRect2 } from "@tscircuit/math-utils";
 import Debug8 from "debug";
 
+// lib/utils/schematic/getRotatedSymbolName.ts
+function rotateDirection(direction, ccwRotationDegrees) {
+  const directions = ["right", "up", "left", "down"];
+  const currentIndex = directions.indexOf(direction);
+  if (currentIndex === -1) return direction;
+  const steps = Math.round(ccwRotationDegrees / 90);
+  const newIndex = (currentIndex + steps) % 4;
+  return directions[newIndex < 0 ? newIndex + 4 : newIndex];
+}
+function getRotatedSymbolName(symbolName, ccwRotationDegrees) {
+  if (!symbolName) return symbolName;
+  let rotatedSymbolName = symbolName;
+  const schematicSymbolDirection = rotatedSymbolName.match(
+    /_(right|left|up|down)$/
+  );
+  if (schematicSymbolDirection) {
+    rotatedSymbolName = rotatedSymbolName.replace(
+      schematicSymbolDirection[0],
+      `_${rotateDirection(schematicSymbolDirection[1], ccwRotationDegrees)}`
+    );
+  }
+  const schematicSymbolOrientation = rotatedSymbolName.match(/_(horz|vert)$/);
+  if (schematicSymbolOrientation && shouldSwapOrientation(ccwRotationDegrees)) {
+    rotatedSymbolName = rotatedSymbolName.replace(
+      schematicSymbolOrientation[0],
+      schematicSymbolOrientation[1] === "horz" ? "_vert" : "_horz"
+    );
+  }
+  return rotatedSymbolName;
+}
+function shouldSwapOrientation(ccwRotationDegrees) {
+  const normalizedRotation = (Math.round(ccwRotationDegrees) % 360 + 360) % 360;
+  return normalizedRotation === 90 || normalizedRotation === 270;
+}
+function getRotatedSize(size, ccwRotationDegrees) {
+  if (!shouldSwapOrientation(ccwRotationDegrees)) return size;
+  return { width: size.height, height: size.width };
+}
+
 // lib/utils/schematic/getSchematicComponentWithTextBounds.ts
 import { getBoundFromCenteredRect } from "@tscircuit/math-utils";
 import { symbols as symbols3 } from "schematic-symbols";
@@ -19011,7 +19051,8 @@ var TEXT_BOX_ENABLED_FTYPES = /* @__PURE__ */ new Set([
   "simple_led",
   "simple_transistor",
   "simple_mosfet",
-  "simple_op_amp"
+  "simple_op_amp",
+  "simple_voltage_source"
 ]);
 function getTextBounds({
   text,
@@ -19116,14 +19157,34 @@ function getSchematicComponentTextInclusiveBounds(db, schematicComponent) {
   }
   return bounds;
 }
-function getSchematicComponentWithTextBounds(db, schematicComponent) {
+function getOrientedSchematicComponent(schematicComponent, ccwRotationDegrees) {
+  let size = schematicComponent.size;
+  if (size) size = getRotatedSize(size, ccwRotationDegrees);
+  return {
+    ...schematicComponent,
+    symbol_name: getRotatedSymbolName(
+      schematicComponent.symbol_name,
+      ccwRotationDegrees
+    ),
+    size
+  };
+}
+function getSchematicComponentWithTextBounds({
+  db,
+  schematicComponent,
+  ccwRotationDegrees = 0
+}) {
+  const orientedComponent = getOrientedSchematicComponent(
+    schematicComponent,
+    ccwRotationDegrees
+  );
   const textBounds = getSchematicComponentTextInclusiveBounds(
     db,
-    schematicComponent
+    orientedComponent
   );
   if (!textBounds) return null;
-  const boxBounds = getSymbolBoxBounds(schematicComponent);
-  const isVertical = schematicComponent.size.height > schematicComponent.size.width;
+  const boxBounds = getSymbolBoxBounds(orientedComponent);
+  const isVertical = orientedComponent.size.height > orientedComponent.size.width;
   if (isVertical) return textBounds;
   const padLeft = Math.max(0, boxBounds.minX - textBounds.minX);
   const padRight = Math.max(0, textBounds.maxX - boxBounds.maxX);
@@ -19150,7 +19211,6 @@ function getSchematicComponentWithTextBounds(db, schematicComponent) {
 }
 
 // lib/components/primitive-components/Group/applySchematicMatchPackLayoutToTree.ts
-import { getBoundFromCenteredRect as getBoundFromCenteredRect2 } from "@tscircuit/math-utils";
 var debug6 = Debug8("Group_doInitialSchematicLayoutMatchpack");
 var DEFAULT_AVAILABLE_ROTATIONS = [0, 90, 180, 270];
 var ROTATION_TO_PLACE_SIDE_ON_TOP = {
@@ -19173,40 +19233,90 @@ function facingDirectionToSide(facingDirection) {
       return "y+";
   }
 }
-function applyPowerGroundRotationConstraints(problem) {
-  for (const chip of Object.values(problem.chipMap)) {
-    if (chip.pins.length !== 2) continue;
-    if (chip.availableRotations?.length !== DEFAULT_AVAILABLE_ROTATIONS.length)
-      continue;
-    const powerGroundRotations = /* @__PURE__ */ new Set();
-    for (const pinId of chip.pins) {
-      const pin = problem.chipPinMap[pinId];
-      if (!pin) continue;
-      for (const [netId, net] of Object.entries(problem.netMap)) {
-        if (!problem.netConnMap[`${pinId}-${netId}`]) continue;
-        if (net.isPositiveVoltageSource === net.isGround) continue;
-        const rotationToPlacePinOnTop = ROTATION_TO_PLACE_SIDE_ON_TOP[pin.side];
-        const rotation4 = net.isPositiveVoltageSource ? rotationToPlacePinOnTop : (rotationToPlacePinOnTop + 180) % 360;
-        powerGroundRotations.add(rotation4);
-      }
-    }
-    if (powerGroundRotations.size === 1) {
-      chip.availableRotations = [powerGroundRotations.values().next().value];
-    }
+function getPowerGroundForcedRotation(db, ports) {
+  if (ports.length !== 2) return null;
+  const powerGroundRotations = /* @__PURE__ */ new Set();
+  for (const port of ports) {
+    const sourcePort = db.source_port.get(port.source_port_id);
+    const connectivityKey = sourcePort?.subcircuit_connectivity_map_key;
+    if (!connectivityKey) continue;
+    const net = db.source_net.getWhere({
+      subcircuit_connectivity_map_key: connectivityKey
+    });
+    if (!net) continue;
+    const isGround = net.is_ground ?? false;
+    const isPositiveVoltageSource = net.is_power === true || net.is_positive_voltage_source === true;
+    if (isPositiveVoltageSource === isGround) continue;
+    const rotationToPlacePinOnTop = ROTATION_TO_PLACE_SIDE_ON_TOP[facingDirectionToSide(port.facing_direction)];
+    const rotation4 = isPositiveVoltageSource ? rotationToPlacePinOnTop : (rotationToPlacePinOnTop + 180) % 360;
+    powerGroundRotations.add(rotation4);
+  }
+  return powerGroundRotations.size === 1 ? powerGroundRotations.values().next().value : null;
+}
+function getChipSize({
+  db,
+  schematicComponent,
+  component,
+  ccwRotationDegrees
+}) {
+  let orientedSymbolSize = schematicComponent.size;
+  if (orientedSymbolSize) {
+    orientedSymbolSize = getRotatedSize(orientedSymbolSize, ccwRotationDegrees);
   }
+  const componentWithTextBounds = getSchematicComponentWithTextBounds({
+    db,
+    schematicComponent,
+    ccwRotationDegrees
+  });
+  let textPadLeft = 0;
+  let textPadRight = 0;
+  let textPadTop = 0;
+  let textPadBottom = 0;
+  if (componentWithTextBounds && schematicComponent.center) {
+    const halfWidth = (orientedSymbolSize?.width ?? 0) / 2;
+    const halfHeight = (orientedSymbolSize?.height ?? 0) / 2;
+    textPadLeft = schematicComponent.center.x - halfWidth - componentWithTextBounds.minX;
+    textPadRight = componentWithTextBounds.maxX - (schematicComponent.center.x + halfWidth);
+    textPadTop = componentWithTextBounds.maxY - (schematicComponent.center.y + halfHeight);
+    textPadBottom = schematicComponent.center.y - halfHeight - componentWithTextBounds.minY;
+  }
+  const marginLeft = (component?._parsedProps?.schMarginLeft ?? component?._parsedProps?.schMarginX ?? 0) + textPadLeft;
+  const marginRight = (component?._parsedProps?.schMarginRight ?? component?._parsedProps?.schMarginX ?? 0) + textPadRight;
+  let marginTop = (component?._parsedProps?.schMarginTop ?? component?._parsedProps?.schMarginY ?? 0) + textPadTop;
+  let marginBottom = (component?._parsedProps?.schMarginBottom ?? component?._parsedProps?.schMarginY ?? 0) + textPadBottom;
+  if (component?.config.shouldRenderAsSchematicBox) {
+    marginTop += 0.4;
+    marginBottom += 0.4;
+  }
+  const orientedFootprint = {
+    width: (orientedSymbolSize?.width || 1) + marginLeft + marginRight,
+    height: (orientedSymbolSize?.height || 1) + marginTop + marginBottom
+  };
+  const chipSize = getRotatedSize(orientedFootprint, ccwRotationDegrees);
+  return { x: chipSize.width, y: chipSize.height };
 }
-function rotateDirection(direction, degrees) {
-  const directions = [
-    "right",
-    "up",
-    "left",
-    "down"
-  ];
-  const currentIndex = directions.indexOf(direction);
-  if (currentIndex === -1) return direction;
-  const steps = Math.round(degrees / 90);
-  const newIndex = (currentIndex + steps) % 4;
-  return directions[newIndex < 0 ? newIndex + 4 : newIndex];
+function getReservedChipSize({
+  db,
+  schematicComponent,
+  component,
+  ccwRotationDegrees,
+  chipGap
+}) {
+  const unrotatedSize = getChipSize({
+    db,
+    schematicComponent,
+    component,
+    ccwRotationDegrees: 0
+  });
+  if (!shouldSwapOrientation(ccwRotationDegrees)) return unrotatedSize;
+  const rotatedSize = getChipSize({
+    db,
+    schematicComponent,
+    component,
+    ccwRotationDegrees
+  });
+  const growsPastGap = rotatedSize.x - unrotatedSize.x >= chipGap || rotatedSize.y - unrotatedSize.y >= chipGap;
+  return growsPastGap ? rotatedSize : unrotatedSize;
 }
 function isTreeChildExplicitlyPositioned(treeChild, group) {
   if (treeChild.nodeType === "component" && treeChild.sourceComponent) {
@@ -19272,6 +19382,9 @@ function convertTreeToMatchPackInputProblem(tree, db, group) {
       const component = group.children.find(
         (groupChild) => groupChild.source_component_id === child.sourceComponent?.source_component_id
       );
+      const ports = db.schematic_port.list({
+        schematic_component_id: schematicComponent.schematic_component_id
+      });
       let availableRotations = [
         ...DEFAULT_AVAILABLE_ROTATIONS
       ];
@@ -19290,39 +19403,21 @@ function convertTreeToMatchPackInputProblem(tree, db, group) {
       if (component?.componentName === "Chip") {
         availableRotations = [0];
       }
-      const componentWithTextBounds = getSchematicComponentWithTextBounds(
-        db,
-        schematicComponent
-      );
-      let textPadLeft = 0;
-      let textPadRight = 0;
-      let textPadTop = 0;
-      let textPadBottom = 0;
-      if (componentWithTextBounds && schematicComponent.center) {
-        const halfWidth = (schematicComponent.size?.width ?? 0) / 2;
-        const halfHeight = (schematicComponent.size?.height ?? 0) / 2;
-        textPadLeft = schematicComponent.center.x - halfWidth - componentWithTextBounds.minX;
-        textPadRight = componentWithTextBounds.maxX - (schematicComponent.center.x + halfWidth);
-        textPadTop = componentWithTextBounds.maxY - (schematicComponent.center.y + halfHeight);
-        textPadBottom = schematicComponent.center.y - halfHeight - componentWithTextBounds.minY;
-      }
-      const marginLeft = (component?._parsedProps?.schMarginLeft ?? component?._parsedProps?.schMarginX ?? 0) + textPadLeft;
-      const marginRight = (component?._parsedProps?.schMarginRight ?? component?._parsedProps?.schMarginX ?? 0) + textPadRight;
-      let marginTop = (component?._parsedProps?.schMarginTop ?? component?._parsedProps?.schMarginY ?? 0) + textPadTop;
-      let marginBottom = (component?._parsedProps?.schMarginBottom ?? component?._parsedProps?.schMarginY ?? 0) + textPadBottom;
-      if (component?.config.shouldRenderAsSchematicBox) {
-        marginTop += 0.4;
-        marginBottom += 0.4;
-      }
-      const marginXShift = (marginRight - marginLeft) / 2;
-      const marginYShift = (marginTop - marginBottom) / 2;
+      if (availableRotations.length === DEFAULT_AVAILABLE_ROTATIONS.length) {
+        const forcedRotation = getPowerGroundForcedRotation(db, ports);
+        if (forcedRotation !== null) availableRotations = [forcedRotation];
+      }
+      const ccwRotationDegrees = availableRotations.length === 1 ? availableRotations[0] : 0;
       problem.chipMap[chipId] = {
         chipId,
         pins: [],
-        size: {
-          x: (schematicComponent.size?.width || 1) + marginLeft + marginRight,
-          y: (schematicComponent.size?.height || 1) + marginTop + marginBottom
-        },
+        size: getReservedChipSize({
+          db,
+          schematicComponent,
+          component,
+          ccwRotationDegrees,
+          chipGap: problem.chipGap
+        }),
         isCapacitor: child.sourceComponent.ftype === "simple_capacitor",
         availableRotations,
         ...explicitlyPositioned && {
@@ -19332,9 +19427,6 @@ function convertTreeToMatchPackInputProblem(tree, db, group) {
           }
         }
       };
-      const ports = db.schematic_port.list({
-        schematic_component_id: schematicComponent.schematic_component_id
-      });
       for (const port of ports) {
         const sourcePort = db.source_port.get(port.source_port_id);
         if (!sourcePort) continue;
@@ -19380,7 +19472,10 @@ function convertTreeToMatchPackInputProblem(tree, db, group) {
         for (const comp of groupComponents) {
           if (comp.center && comp.size) {
             hasValidBounds = true;
-            const compBounds = getSchematicComponentWithTextBounds(db, comp) ?? getBoundFromCenteredRect2({
+            const compBounds = getSchematicComponentWithTextBounds({
+              db,
+              schematicComponent: comp
+            }) ?? getBoundFromCenteredRect2({
               center: comp.center,
               width: comp.size.width,
               height: comp.size.height
@@ -19586,7 +19681,6 @@ function convertTreeToMatchPackInputProblem(tree, db, group) {
       );
     }
   }
-  applyPowerGroundRotationConstraints(problem);
   return problem;
 }
 function applySchematicMatchPackLayoutToTree(group, tree) {
@@ -19755,24 +19849,10 @@ function applySchematicMatchPackLayoutToTree(group, tree) {
             text.position.y = newCenter.y + rotatedDy;
           }
           if (schematicComponent.symbol_name) {
-            const schematicSymbolDirection = schematicComponent.symbol_name.match(/_(right|left|up|down)$/);
-            if (schematicSymbolDirection) {
-              schematicComponent.symbol_name = schematicComponent.symbol_name.replace(
-                schematicSymbolDirection[0],
-                `_${rotateDirection(schematicSymbolDirection[1], placement.ccwRotationDegrees)}`
-              );
-            }
-            const schematicSymbolOrientation = schematicComponent.symbol_name.match(/_(horz|vert)$/);
-            if (schematicSymbolOrientation) {
-              const normalizedRot = (placement.ccwRotationDegrees % 360 + 360) % 360;
-              const shouldSwapOrientation = normalizedRot === 90 || normalizedRot === 270;
-              if (shouldSwapOrientation) {
-                schematicComponent.symbol_name = schematicComponent.symbol_name.replace(
-                  schematicSymbolOrientation[0],
-                  schematicSymbolOrientation[1] === "horz" ? "_vert" : "_horz"
-                );
-              }
-            }
+            schematicComponent.symbol_name = getRotatedSymbolName(
+              schematicComponent.symbol_name,
+              placement.ccwRotationDegrees
+            );
           }
         }
       }
@@ -20238,8 +20318,19 @@ var SCHEMATIC_RAIL_NET_LABEL_HEIGHT = 0.42;
 function createSchematicTraceSolverInputProblem(group) {
   const { db } = group.root;
   const connKeyToSourceNet = /* @__PURE__ */ new Map();
-  const traces = group.selectAll("trace");
-  const childGroups = group.selectAll("group");
+  const childGroups = [];
+  const componentsToVisit = [...group.children].reverse();
+  while (componentsToVisit.length > 0) {
+    const child = componentsToVisit.pop();
+    if (child instanceof Group) {
+      if (child.isSubcircuit) {
+        if (child._parsedProps.showAsSchematicBox) childGroups.push(child);
+        continue;
+      }
+      childGroups.push(child);
+    }
+    componentsToVisit.push(...[...child.children].reverse());
+  }
   const allSchematicGroupIds = [
     group.schematic_group_id,
     ...childGroups.map((a) => a.schematic_group_id)
@@ -20321,7 +20412,7 @@ function createSchematicTraceSolverInputProblem(group) {
     if (sourceComponent?.name) {
       sectionId = componentNameToSectionId.get(sourceComponent.name);
     }
-    const layoutBounds = getSchematicComponentWithTextBounds(db, schematicComponent) ?? getBoundFromCenteredRect4({
+    const layoutBounds = getSchematicComponentWithTextBounds({ db, schematicComponent }) ?? getBoundFromCenteredRect4({
       center: schematicComponent.center,
       width: schematicComponent.size.width,
       height: schematicComponent.size.height
@@ -21008,7 +21099,7 @@ function applyTracesFromSolverOutput(args) {
   const { db } = group.root;
   const eligiblePortIds = /* @__PURE__ */ new Set();
   for (const schematicComponent of db.schematic_component.list()) {
-    if (!getSchematicComponentWithTextBounds(db, schematicComponent)) {
+    if (!getSchematicComponentWithTextBounds({ db, schematicComponent })) {
       continue;
     }
     for (const port of db.schematic_port.list({
@@ -22396,7 +22487,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1433",
+  version: "0.0.1435",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -23425,7 +23516,7 @@ var ensureRouteStartsAtSourceTraceStart = ({
   const lastPoint = route[route.length - 1];
   return getDistanceToPoint(lastPoint, firstPcbPort) < getDistanceToPoint(firstPoint, firstPcbPort) ? reversePcbTraceRoute(route) : route;
 };
-var Group5 = class extends NormalComponent3 {
+var Group = class extends NormalComponent3 {
   pcb_group_id = null;
   schematic_group_id = null;
   subcircuit_id = null;
@@ -24838,7 +24929,7 @@ function inflateSourceGroup(sourceGroup, inflatorContext) {
   if (pcbGroup?.anchor_alignment) {
     groupProps2.pcbAnchorAlignment = pcbGroup.anchor_alignment;
   }
-  const group = new Group5(groupProps2);
+  const group = new Group(groupProps2);
   group._isInflatedFromCircuitJson = true;
   group.source_group_id = sourceGroup.source_group_id;
   if (groupsMap) {
@@ -26006,7 +26097,7 @@ var IsolatedCircuit = class {
       this.firstChild = this.children[0];
       return;
     }
-    const group = new Group5({ subcircuit: true });
+    const group = new Group({ subcircuit: true });
     group.parent = this;
     group.addAll(this.children);
     this.children = [group];
@@ -26412,7 +26503,7 @@ var getRoundedRectOutline = (width, height, radius) => {
   }
   return outline;
 };
-var Board = class extends Group5 {
+var Board = class extends Group {
   pcb_board_id = null;
   source_board_id = null;
   _drcChecksComplete = false;
@@ -26876,7 +26967,7 @@ import { mountedboardProps } from "@tscircuit/props";
 
 // lib/components/primitive-components/Group/Subcircuit/Subcircuit.ts
 import "@tscircuit/props";
-var Subcircuit = class extends Group5 {
+var Subcircuit = class extends Group {
   constructor(props) {
     super({
       ...props,
@@ -27448,7 +27539,7 @@ function getItemDimensions(item, db) {
 }
 
 // lib/components/normal-components/Subpanel.ts
-var Subpanel = class _Subpanel extends Group5 {
+var Subpanel = class _Subpanel extends Group {
   pcb_panel_id = null;
   _tabsAndMouseBitesGenerated = false;
   get config() {
@@ -30071,7 +30162,7 @@ var createBreakoutPointSolverInput = (breakout) => {
 };
 
 // lib/components/primitive-components/Breakout/Breakout.ts
-var Breakout = class extends Group5 {
+var Breakout = class extends Group {
   constructor(props) {
     super({
       ...props,
@@ -33330,7 +33421,7 @@ export {
   Fiducial,
   Footprint,
   Fuse,
-  Group5 as Group,
+  Group,
   Hole,
   Inductor,
   Interconnect,

package/package.json

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