@tscircuit/core 0.0.1288 → 0.0.1289

package/dist/index.d.ts

@@ -1498,6 +1498,7 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
     getInheritedProperty(propertyName: string): any;
     getInheritedMergedProperty(propertyName: string): any;
     getResolvedPcbSx(): PcbSx;
+    getSchematicSectionName(): string | null;
     get lowercaseComponentName(): string;
     externallyAddedAliases: string[];
     /**
@@ -2389,6 +2390,7 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     doInitialSchematicComponentRender(): void;
     _getSchematicLayoutMode(): "match-adapt" | "flex" | "grid" | "relative";
     doInitialSchematicLayout(): void;
+    _doInitialSchematicLayoutSections(): void;
     _doInitialSchematicLayoutMatchAdapt(): void;
     _doInitialSchematicLayoutMatchpack(): void;
     _doInitialSchematicLayoutGrid(): void;
@@ -147791,7 +147793,7 @@ declare class SchematicSection extends PrimitiveComponent<typeof schematicSectio
             sectionTitleFontSize?: string | number | undefined;
         }>;
     };
-    _computeSectionBounds(board: PrimitiveComponent): Bounds | null;
+    _computeSectionBounds(board: PrimitiveComponent, sectionName: string | null): Bounds | null;
     doInitialSchematicSectionRender(): void;
 }
 

package/dist/index.js

@@ -1275,6 +1275,9 @@ var PrimitiveComponent2 = class extends Renderable {
       ownPcbSx: this._parsedProps?.pcbSx
     });
   }
+  getSchematicSectionName() {
+    return this._parsedProps?.schSectionName ?? null;
+  }
   get lowercaseComponentName() {
     return this.componentName.toLowerCase();
   }
@@ -16685,18 +16688,16 @@ function Group_doInitialSchematicLayoutMatchAdapt(group) {
   const subtreeCircuitJson = buildSubtree(db.toArray(), {
     source_group_id: group.source_group_id
   });
-  const bpcGraphBeforeGeneratedNetLabels = convertCircuitJsonToBpc(subtreeCircuitJson);
+  const shouldSkip = subtreeCircuitJson.filter((item) => item.type === "source_component").length <= 1;
+  if (shouldSkip) return;
+  const floatingGraph = convertCircuitJsonToBpc(subtreeCircuitJson);
   if (debug5.enabled && global?.debugGraphics) {
     global.debugGraphics?.push(
-      getGraphicsForBpcGraph(bpcGraphBeforeGeneratedNetLabels, {
+      getGraphicsForBpcGraph(floatingGraph, {
         title: `floatingBpcGraph-${group.name}`
       })
     );
   }
-  const floatingGraph = convertCircuitJsonToBpc(
-    subtreeCircuitJson
-    // .concat(implicitNetLabels),
-  );
   const floatingGraphNoNotConnected = {
     boxes: floatingGraph.boxes,
     pins: floatingGraph.pins.map((p) => ({
@@ -16801,9 +16802,10 @@ function Group_doInitialSchematicLayoutMatchAdapt(group) {
 }
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicLayoutMatchPack.ts
-import {
-  getCircuitJsonTree as getCircuitJsonTree2
-} from "@tscircuit/circuit-json-util";
+import { getCircuitJsonTree as getCircuitJsonTree2 } from "@tscircuit/circuit-json-util";
+
+// lib/components/primitive-components/Group/applySchematicMatchPackLayoutToTree.ts
+import "@tscircuit/circuit-json-util";
 import { LayoutPipelineSolver } from "@tscircuit/matchpack";
 import Debug8 from "debug";
 var debug6 = Debug8("Group_doInitialSchematicLayoutMatchpack");
@@ -16858,7 +16860,7 @@ function getTreeChildChipId(child, index) {
   }
   return null;
 }
-function convertTreeToInputProblem(tree, db, group) {
+function convertTreeToMatchPackInputProblem(tree, db, group) {
   const problem = {
     chipMap: {},
     chipPinMap: {},
@@ -17184,11 +17186,8 @@ function convertTreeToInputProblem(tree, db, group) {
   }
   return problem;
 }
-function Group_doInitialSchematicLayoutMatchPack(group) {
+function applySchematicMatchPackLayoutToTree(group, tree) {
   const { db } = group.root;
-  const tree = getCircuitJsonTree2(db.toArray(), {
-    source_group_id: group.source_group_id
-  });
   debug6(
     `[${group.name}] Starting matchpack layout with ${tree.childNodes.length} children`
   );
@@ -17200,7 +17199,7 @@ function Group_doInitialSchematicLayoutMatchPack(group) {
     return;
   }
   debug6("Converting circuit tree to InputProblem...");
-  const inputProblem = convertTreeToInputProblem(tree, db, group);
+  const inputProblem = convertTreeToMatchPackInputProblem(tree, db, group);
   if (debug6.enabled) {
     group.root?.emit("debug:logOutput", {
       type: "debug:logOutput",
@@ -17355,8 +17354,8 @@ function Group_doInitialSchematicLayoutMatchPack(group) {
             }
             const schematicSymbolOrientation = schematicComponent.symbol_name.match(/_(horz|vert)$/);
             if (schematicSymbolOrientation) {
-              const normalizedRotation2 = (placement.ccwRotationDegrees % 360 + 360) % 360;
-              const shouldSwapOrientation = normalizedRotation2 === 90 || normalizedRotation2 === 270;
+              const normalizedRot = (placement.ccwRotationDegrees % 360 + 360) % 360;
+              const shouldSwapOrientation = normalizedRot === 90 || normalizedRot === 270;
               if (shouldSwapOrientation) {
                 schematicComponent.symbol_name = schematicComponent.symbol_name.replace(
                   schematicSymbolOrientation[0],
@@ -17427,6 +17426,188 @@ function Group_doInitialSchematicLayoutMatchPack(group) {
   debug6("Matchpack layout completed successfully");
 }
 
+// lib/components/primitive-components/Group/Group_doInitialSchematicLayoutMatchPack.ts
+function Group_doInitialSchematicLayoutMatchPack(group) {
+  const { db } = group.root;
+  const tree = getCircuitJsonTree2(db.toArray(), {
+    source_group_id: group.source_group_id
+  });
+  applySchematicMatchPackLayoutToTree(group, tree);
+}
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicLayoutSections.ts
+import { getCircuitJsonTree as getCircuitJsonTree3 } from "@tscircuit/circuit-json-util";
+
+// lib/components/primitive-components/Group/computeSchematicSectionLayoutUsingRows.ts
+var SECTION_GAP = 1;
+var MARGIN = 1.5;
+function computeSchematicSectionLayoutUsingRows({
+  sectionBlocks,
+  groupSchPositionBeforeLayout: groupOffset
+}) {
+  const totalArea = sectionBlocks.reduce((sum, block) => {
+    const paddedWidth = Math.max(block.size.x, 0.5) + MARGIN * 2;
+    const paddedHeight = Math.max(block.size.y, 0.5) + MARGIN * 2;
+    return sum + paddedWidth * paddedHeight;
+  }, 0);
+  const targetRowWidth = Math.sqrt(totalArea) * 2;
+  const computedSectionsMatrix = [];
+  let currentSectionRow = [];
+  let currentRowSectionWidth = 0;
+  for (const section of sectionBlocks) {
+    const paddedWidth = Math.max(section.size.x, 0.5) + MARGIN * 2;
+    const paddedHeight = Math.max(section.size.y, 0.5) + MARGIN * 2;
+    const neededWidth = currentRowSectionWidth > 0 ? currentRowSectionWidth + SECTION_GAP + paddedWidth : paddedWidth;
+    if (currentSectionRow.length > 0 && neededWidth > targetRowWidth) {
+      computedSectionsMatrix.push(currentSectionRow);
+      currentSectionRow = [];
+      currentRowSectionWidth = 0;
+    }
+    const xOffsetInRow = currentRowSectionWidth > 0 ? currentRowSectionWidth + SECTION_GAP : 0;
+    currentSectionRow.push({
+      sectionName: section.sectionName,
+      rowOffset: xOffsetInRow,
+      width: paddedWidth,
+      height: paddedHeight
+    });
+    currentRowSectionWidth = xOffsetInRow + paddedWidth;
+  }
+  if (currentSectionRow.length > 0)
+    computedSectionsMatrix.push(currentSectionRow);
+  const sectionPlacements = /* @__PURE__ */ new Map();
+  let rowY = 0;
+  for (const sectionRow of computedSectionsMatrix) {
+    const rowHeight = Math.max(...sectionRow.map((rowEntry) => rowEntry.height));
+    const rowWidth = sectionRow[sectionRow.length - 1].rowOffset + sectionRow[sectionRow.length - 1].width;
+    const rowCenteringOffsetX = -rowWidth / 2;
+    for (const section of sectionRow) {
+      sectionPlacements.set(section.sectionName, {
+        x: rowCenteringOffsetX + section.rowOffset + section.width / 2 + groupOffset.x,
+        y: rowY - rowHeight / 2 + groupOffset.y
+      });
+    }
+    rowY -= rowHeight + SECTION_GAP;
+  }
+  return sectionPlacements;
+}
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicLayoutSections.ts
+function Group_doInitialSchematicLayoutSections(group) {
+  const { db } = group.root;
+  const sectionNamesUsedByChildren = /* @__PURE__ */ new Set();
+  let hasChildrenWithoutSection = false;
+  for (const child of group.children) {
+    if (!child.source_component_id) continue;
+    const sectionName = child.getSchematicSectionName();
+    if (sectionName !== null) {
+      sectionNamesUsedByChildren.add(sectionName);
+    } else {
+      hasChildrenWithoutSection = true;
+    }
+  }
+  const sectionNamesToLayout = Array.from(
+    sectionNamesUsedByChildren
+  );
+  if (hasChildrenWithoutSection) sectionNamesToLayout.push(null);
+  if (sectionNamesToLayout.length === 0) return;
+  for (const sectionName of sectionNamesToLayout) {
+    const sectionTree = getCircuitJsonTree3(db.toArray(), {
+      source_group_id: group.source_group_id
+    });
+    sectionTree.childNodes = sectionTree.childNodes.filter((child) => {
+      if (child.nodeType !== "component" || !child.sourceComponent) return false;
+      const component = group.children.find(
+        (c) => c.source_component_id === child.sourceComponent?.source_component_id
+      );
+      const compSection = component?.getSchematicSectionName() ?? null;
+      return compSection === sectionName;
+    });
+    applySchematicMatchPackLayoutToTree(group, sectionTree);
+  }
+  if (sectionNamesToLayout.length <= 1) return;
+  const sectionNameToBoundsWithChildren = /* @__PURE__ */ new Map();
+  for (const sectionName of sectionNamesToLayout) {
+    let minX = Infinity;
+    let maxX = -Infinity;
+    let minY = Infinity;
+    let maxY = -Infinity;
+    const sourceCompIds = /* @__PURE__ */ new Set();
+    for (const child of group.children) {
+      const sourceComponentId = child.source_component_id;
+      if (!sourceComponentId) continue;
+      const compSectionName = child.getSchematicSectionName();
+      if (compSectionName !== sectionName) continue;
+      const schComp = db.schematic_component.getWhere({
+        source_component_id: sourceComponentId
+      });
+      if (!schComp) continue;
+      sourceCompIds.add(sourceComponentId);
+      const hw = schComp.size.width / 2;
+      const hh = schComp.size.height / 2;
+      minX = Math.min(minX, schComp.center.x - hw);
+      maxX = Math.max(maxX, schComp.center.x + hw);
+      minY = Math.min(minY, schComp.center.y - hh);
+      maxY = Math.max(maxY, schComp.center.y + hh);
+    }
+    if (!Number.isFinite(minX) || sourceCompIds.size === 0) continue;
+    sectionNameToBoundsWithChildren.set(sectionName, {
+      sectionName,
+      center: { x: (minX + maxX) / 2, y: (minY + maxY) / 2 },
+      size: { x: maxX - minX, y: maxY - minY },
+      sourceCompIds
+    });
+  }
+  if (sectionNameToBoundsWithChildren.size <= 1) return;
+  const groupSchPositionBeforeLayout = group._getGlobalSchematicPositionBeforeLayout();
+  const sectionPlacements = computeSchematicSectionLayoutUsingRows({
+    sectionBlocks: Array.from(sectionNameToBoundsWithChildren.values()).map(
+      (bounds) => ({
+        sectionName: bounds.sectionName,
+        size: bounds.size
+      })
+    ),
+    groupSchPositionBeforeLayout
+  });
+  for (const [sectionName, placement] of sectionPlacements) {
+    const boundsWithChildren = sectionNameToBoundsWithChildren.get(sectionName);
+    if (!boundsWithChildren) continue;
+    const delta = {
+      x: placement.x - boundsWithChildren.center.x,
+      y: placement.y - boundsWithChildren.center.y
+    };
+    for (const sourceComponentId of boundsWithChildren.sourceCompIds) {
+      const schComp = db.schematic_component.getWhere({
+        source_component_id: sourceComponentId
+      });
+      if (!schComp) continue;
+      const ports = db.schematic_port.list({
+        schematic_component_id: schComp.schematic_component_id
+      });
+      const texts = db.schematic_text.list({
+        schematic_component_id: schComp.schematic_component_id
+      });
+      for (const port of ports) {
+        port.center.x += delta.x;
+        port.center.y += delta.y;
+      }
+      for (const text of texts) {
+        text.position.x += delta.x;
+        text.position.y += delta.y;
+      }
+      updateSchematicPrimitivesForLayoutShift({
+        db,
+        schematicComponentId: schComp.schematic_component_id,
+        deltaX: delta.x,
+        deltaY: delta.y
+      });
+      schComp.center = {
+        x: schComp.center.x + delta.x,
+        y: schComp.center.y + delta.y
+      };
+    }
+  }
+}
+
 // lib/components/primitive-components/Group/Group_doInitialSchematicBoxComponentRender.ts
 var parsePinNumberFromPortName = (name) => {
   if (!name) return null;
@@ -20803,6 +20984,18 @@ var Group5 = class extends NormalComponent3 {
       this._insertSchematicBorder();
       return;
     }
+    const hasAnySectionName = this.children.some(
+      (c) => c.source_component_id !== null && c._parsedProps?.schSectionName !== void 0
+    );
+    const hasAnyExplicitPosition = this.children.some(
+      (c) => c.source_component_id !== null && (c._parsedProps?.schX !== void 0 || c._parsedProps?.schY !== void 0)
+    );
+    const hasSections = hasAnySectionName && !hasAnyExplicitPosition;
+    if (hasSections) {
+      this._doInitialSchematicLayoutSections();
+      this._insertSchematicBorder();
+      return;
+    }
     const schematicLayoutMode = this._getSchematicLayoutMode();
     if (schematicLayoutMode === "match-adapt") {
       this._doInitialSchematicLayoutMatchpack();
@@ -20815,6 +21008,9 @@ var Group5 = class extends NormalComponent3 {
     }
     this._insertSchematicBorder();
   }
+  _doInitialSchematicLayoutSections() {
+    Group_doInitialSchematicLayoutSections(this);
+  }
   _doInitialSchematicLayoutMatchAdapt() {
     Group_doInitialSchematicLayoutMatchAdapt(this);
   }
@@ -22044,7 +22240,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1287",
+  version: "0.0.1288",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -22156,7 +22352,7 @@ var package_default = {
   dependencies: {
     "@flatten-js/core": "^1.6.2",
     "@lume/kiwi": "^0.4.3",
-    "calculate-cell-boundaries": "^0.0.8",
+    "calculate-cell-boundaries": "^0.0.13",
     "calculate-packing": "0.0.73",
     "css-select": "5.1.0",
     "format-si-unit": "^0.0.3",
@@ -28566,10 +28762,10 @@ var SchematicSection = class _SchematicSection extends PrimitiveComponent2 {
       zodProps: schematicSectionProps
     };
   }
-  _computeSectionBounds(board) {
+  // Pass null to compute bounds for components with no schSectionName
+  _computeSectionBounds(board, sectionName) {
     const { db } = this.root;
-    const { name } = this._parsedProps;
-    const members = board.getDescendants().filter((c) => c.props?.schSectionName === name);
+    const members = board.getDescendants().filter((c) => c.getSchematicSectionName() === sectionName);
     if (members.length === 0) return null;
     const positions = [];
     for (const member of members) {
@@ -28600,11 +28796,15 @@ var SchematicSection = class _SchematicSection extends PrimitiveComponent2 {
     const LABEL_PADDING = 0.2;
     const STROKE_WIDTH = 0.02;
     const TOL3 = 1e-3;
-    const sectionData = allSections.map((section) => {
-      const bounds = section._computeSectionBounds(board);
+    const namedSectionsWithBounds = allSections.map((section) => {
+      const bounds = section._computeSectionBounds(
+        board,
+        section._parsedProps.name
+      );
       if (!bounds) return null;
       return {
-        section,
+        displayName: section._parsedProps.displayName,
+        sectionTitleFontSize: section._parsedProps.sectionTitleFontSize,
         rawBounds: bounds,
         cell: {
           minX: bounds.minX - PADDING,
@@ -28614,12 +28814,26 @@ var SchematicSection = class _SchematicSection extends PrimitiveComponent2 {
         }
       };
     }).filter((s) => s !== null);
-    if (sectionData.length === 0) return;
-    const allCells = sectionData.map((s) => s.cell);
+    const unsectionedBounds = this._computeSectionBounds(board, null);
+    const allSectionsWithBounds = [...namedSectionsWithBounds];
+    if (unsectionedBounds)
+      allSectionsWithBounds.push({
+        displayName: void 0,
+        sectionTitleFontSize: void 0,
+        rawBounds: unsectionedBounds,
+        cell: {
+          minX: unsectionedBounds.minX - PADDING,
+          maxX: unsectionedBounds.maxX + PADDING,
+          minY: unsectionedBounds.minY - PADDING,
+          maxY: unsectionedBounds.maxY + PADDING
+        }
+      });
+    if (allSectionsWithBounds.length === 0) return;
+    const allCells = allSectionsWithBounds.map((s) => s.cell);
     const outer = computeBoundsFromCellContents(allCells);
     const CELL_MARGIN = 1;
     const dividers = calculateCellBoundaries(
-      sectionData.map((s) => ({
+      allSectionsWithBounds.map((s) => ({
         minX: s.rawBounds.minX - CELL_MARGIN,
         maxX: s.rawBounds.maxX + CELL_MARGIN,
         minY: s.rawBounds.minY - CELL_MARGIN,
@@ -28643,8 +28857,11 @@ var SchematicSection = class _SchematicSection extends PrimitiveComponent2 {
     const vDividers = dividers.filter(
       (l) => Math.abs(l.start.x - l.end.x) < TOL3
     );
-    for (const { section, rawBounds } of sectionData) {
-      const { displayName, sectionTitleFontSize } = section._parsedProps;
+    for (const {
+      displayName,
+      sectionTitleFontSize,
+      rawBounds
+    } of allSectionsWithBounds) {
       if (!displayName) continue;
       const dividersAbove = hDividers.map((l) => l.start.y).filter((y) => y > rawBounds.maxY);
       const topBoundary = dividersAbove.length > 0 ? Math.min(...dividersAbove) : outer.maxY;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1288",
+  "version": "0.0.1289",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -113,7 +113,7 @@
   "dependencies": {
     "@flatten-js/core": "^1.6.2",
     "@lume/kiwi": "^0.4.3",
-    "calculate-cell-boundaries": "^0.0.8",
+    "calculate-cell-boundaries": "^0.0.13",
     "calculate-packing": "0.0.73",
     "css-select": "5.1.0",
     "format-si-unit": "^0.0.3",