@tscircuit/core 0.0.627 → 0.0.628

package/dist/index.d.ts

@@ -1128,6 +1128,7 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     _doInitialSchematicLayoutMatchAdapt(): void;
     _doInitialSchematicLayoutMatchpack(): void;
     _doInitialSchematicLayoutGrid(): void;
+    _doInitialSchematicLayoutFlex(): void;
     _getPcbLayoutMode(): "grid" | "flex" | "match-adapt" | "pack" | "none";
     doInitialPcbLayout(): void;
     _doInitialPcbLayoutGrid(): void;

package/dist/index.js

@@ -4173,7 +4173,7 @@ var getMaxLengthFromConnectedCapacitors = (ports, { db }) => {
       return sourceComponent.max_decoupling_trace_length;
     }
     return null;
-  }).filter((length5) => length5 !== null);
+  }).filter((length6) => length6 !== null);
   if (capacitorMaxLengths.length === 0) return void 0;
   return Math.min(...capacitorMaxLengths);
 };
@@ -8706,13 +8706,184 @@ function Group_doInitialSchematicLayoutGrid(group) {
   }
 }
 
+// lib/components/primitive-components/Group/Group_doInitialSchematicLayoutFlex.ts
+import {
+  getCircuitJsonTree as getCircuitJsonTree2,
+  getMinimumFlexContainer,
+  repositionSchematicComponentTo,
+  repositionSchematicGroupTo
+} from "@tscircuit/circuit-json-util";
+import { RootFlexBox } from "@tscircuit/miniflex";
+import { length as length2 } from "circuit-json";
+var getSizeOfTreeNodeChild = (db, child) => {
+  const { sourceComponent, sourceGroup } = child;
+  if (child.nodeType === "component") {
+    const schComponent = db.schematic_component.getWhere({
+      source_component_id: sourceComponent?.source_component_id
+    });
+    if (!schComponent?.size) return null;
+    return {
+      width: schComponent.size.width,
+      height: schComponent.size.height
+    };
+  }
+  if (child.nodeType === "group") {
+    const schGroup = db.schematic_group.getWhere({
+      source_group_id: sourceGroup?.source_group_id
+    });
+    if (!schGroup) return null;
+    return {
+      width: schGroup.width ?? 0,
+      height: schGroup.height ?? 0
+    };
+  }
+  return null;
+};
+var Group_doInitialSchematicLayoutFlex = (group) => {
+  const { db } = group.root;
+  const props = group._parsedProps;
+  const tree = getCircuitJsonTree2(db.toArray(), {
+    source_group_id: group.source_group_id
+  });
+  const rawJustify = props.schJustifyContent ?? props.justifyContent;
+  const rawAlign = props.schAlignItems ?? props.alignItems;
+  const rawGap = props.schFlexGap ?? props.schGap ?? props.gap;
+  const direction = props.schFlexDirection ?? "row";
+  const justifyContent = {
+    start: "flex-start",
+    end: "flex-end",
+    "flex-start": "flex-start",
+    "flex-end": "flex-end",
+    stretch: "space-between",
+    "space-between": "space-between",
+    "space-around": "space-around",
+    "space-evenly": "space-evenly",
+    center: "center"
+  }[rawJustify ?? "space-between"];
+  const alignItems = {
+    start: "flex-start",
+    end: "flex-end",
+    "flex-start": "flex-start",
+    "flex-end": "flex-end",
+    stretch: "stretch",
+    center: "center"
+  }[rawAlign ?? "center"];
+  if (!justifyContent) {
+    throw new Error(`Invalid justifyContent value: "${rawJustify}"`);
+  }
+  if (!alignItems) {
+    throw new Error(`Invalid alignItems value: "${rawAlign}"`);
+  }
+  let rowGap = 0;
+  let columnGap = 0;
+  if (typeof rawGap === "object") {
+    rowGap = rawGap.y ?? 0;
+    columnGap = rawGap.x ?? 0;
+  } else if (typeof rawGap === "number") {
+    rowGap = rawGap;
+    columnGap = rawGap;
+  } else if (typeof rawGap === "string") {
+    rowGap = length2.parse(rawGap);
+    columnGap = length2.parse(rawGap);
+  }
+  let minFlexContainer;
+  let width = props.width ?? props.schWidth ?? void 0;
+  let height = props.height ?? props.schHeight ?? void 0;
+  const isInline = Boolean(width === void 0 || height === void 0);
+  if (isInline) {
+    minFlexContainer = getMinimumFlexContainer(
+      tree.childNodes.map((child) => getSizeOfTreeNodeChild(db, child)).filter((size) => size !== null),
+      {
+        alignItems,
+        justifyContent,
+        direction,
+        rowGap,
+        columnGap
+      }
+    );
+    width = minFlexContainer.width;
+    height = minFlexContainer.height;
+  }
+  const flexBox = new RootFlexBox(width, height, {
+    alignItems,
+    justifyContent,
+    direction,
+    rowGap,
+    columnGap
+  });
+  for (const child of tree.childNodes) {
+    const size = getSizeOfTreeNodeChild(db, child);
+    flexBox.addChild({
+      metadata: child,
+      width: size?.width ?? 0,
+      height: size?.height ?? 0,
+      flexBasis: !size ? void 0 : direction === "row" ? size.width : size.height
+    });
+  }
+  flexBox.build();
+  const bounds = {
+    minX: Infinity,
+    minY: Infinity,
+    maxX: -Infinity,
+    maxY: -Infinity,
+    width: 0,
+    height: 0
+  };
+  for (const child of flexBox.children) {
+    bounds.minX = Math.min(bounds.minX, child.position.x);
+    bounds.minY = Math.min(bounds.minY, child.position.y);
+    bounds.maxX = Math.max(bounds.maxX, child.position.x + child.size.width);
+    bounds.maxY = Math.max(bounds.maxY, child.position.y + child.size.height);
+  }
+  bounds.width = bounds.maxX - bounds.minX;
+  bounds.height = bounds.maxY - bounds.minY;
+  const offset = {
+    x: -(bounds.maxX + bounds.minX) / 2,
+    y: -(bounds.maxY + bounds.minY) / 2
+  };
+  const allCircuitJson = db.toArray();
+  for (const child of flexBox.children) {
+    const { sourceComponent, sourceGroup } = child.metadata;
+    if (sourceComponent) {
+      const schComponent = db.schematic_component.getWhere({
+        source_component_id: sourceComponent.source_component_id
+      });
+      if (!schComponent) continue;
+      repositionSchematicComponentTo(
+        allCircuitJson,
+        schComponent.schematic_component_id,
+        {
+          x: child.position.x + child.size.width / 2 + offset.x,
+          y: child.position.y + child.size.height / 2 + offset.y
+        }
+      );
+    }
+    if (sourceGroup) {
+      const schGroup = db.schematic_group.getWhere({
+        source_group_id: sourceGroup.source_group_id
+      });
+      if (!schGroup) continue;
+      repositionSchematicGroupTo(allCircuitJson, sourceGroup.source_group_id, {
+        x: child.position.x + child.size.width / 2 + offset.x,
+        y: child.position.y + child.size.height / 2 + offset.y
+      });
+    }
+  }
+  if (group.schematic_group_id) {
+    db.schematic_group.update(group.schematic_group_id, {
+      width: bounds.width,
+      height: bounds.height
+    });
+  }
+};
+
 // lib/components/primitive-components/Group/Group_doInitialPcbLayoutGrid.ts
 import { translate as translate5 } from "transformation-matrix";
 import {
   transformPCBElements,
   getPrimaryId
 } from "@tscircuit/circuit-json-util";
-import { length as length2 } from "circuit-json";
+import { length as length3 } from "circuit-json";
 function Group_doInitialPcbLayoutGrid(group) {
   const { db } = group.root;
   const props = group._parsedProps;
@@ -8769,7 +8940,7 @@ function Group_doInitialPcbLayoutGrid(group) {
   let gridGapY;
   const parseGap = (val) => {
     if (val === void 0) return void 0;
-    return typeof val === "number" ? val : length2.parse(val);
+    return typeof val === "number" ? val : length3.parse(val);
   };
   if (gridRowGapOption !== void 0 || gridColumnGapOption !== void 0) {
     const fallbackX = typeof gridGapOption === "object" && gridGapOption !== null ? gridGapOption.x : gridGapOption;
@@ -8780,14 +8951,14 @@ function Group_doInitialPcbLayoutGrid(group) {
     gridGapX = gridGapOption;
     gridGapY = gridGapOption;
   } else if (typeof gridGapOption === "string") {
-    const parsed = length2.parse(gridGapOption);
+    const parsed = length3.parse(gridGapOption);
     gridGapX = parsed;
     gridGapY = parsed;
   } else if (typeof gridGapOption === "object" && gridGapOption !== null) {
     const xRaw = gridGapOption.x;
     const yRaw = gridGapOption.y;
-    gridGapX = typeof xRaw === "number" ? xRaw : length2.parse(xRaw ?? "0mm");
-    gridGapY = typeof yRaw === "number" ? yRaw : length2.parse(yRaw ?? "0mm");
+    gridGapX = typeof xRaw === "number" ? xRaw : length3.parse(xRaw ?? "0mm");
+    gridGapY = typeof yRaw === "number" ? yRaw : length3.parse(yRaw ?? "0mm");
   } else {
     gridGapX = 1;
     gridGapY = 1;
@@ -8904,7 +9075,7 @@ import {
   convertPackOutputToPackInput,
   getGraphicsFromPackOutput
 } from "calculate-packing";
-import { length as length3 } from "circuit-json";
+import { length as length4 } from "circuit-json";
 import {
   transformPCBElements as transformPCBElements2
 } from "@tscircuit/circuit-json-util";
@@ -8923,7 +9094,7 @@ var Group_doInitialPcbLayoutPack = (group) => {
     pcbPackGap
   } = props;
   const gap = pcbPackGap ?? pcbGap ?? gapProp;
-  const gapMm = length3.parse(gap ?? "0mm");
+  const gapMm = length4.parse(gap ?? "0mm");
   const packInput = {
     ...convertPackOutputToPackInput(
       convertCircuitJsonToPackOutput(db.toArray(), {
@@ -8975,14 +9146,14 @@ var Group_doInitialPcbLayoutPack = (group) => {
 
 // lib/components/primitive-components/Group/Group_doInitialPcbLayoutFlex.ts
 import {
-  getCircuitJsonTree as getCircuitJsonTree2,
+  getCircuitJsonTree as getCircuitJsonTree3,
   repositionPcbComponentTo,
   repositionPcbGroupTo,
-  getMinimumFlexContainer
+  getMinimumFlexContainer as getMinimumFlexContainer2
 } from "@tscircuit/circuit-json-util";
-import { RootFlexBox } from "@tscircuit/miniflex";
-import { length as length4 } from "circuit-json";
-var getSizeOfTreeNodeChild = (db, child) => {
+import { RootFlexBox as RootFlexBox2 } from "@tscircuit/miniflex";
+import { length as length5 } from "circuit-json";
+var getSizeOfTreeNodeChild2 = (db, child) => {
   const { sourceComponent, sourceGroup } = child;
   if (child.nodeType === "component") {
     const pcbComponent = db.pcb_component.getWhere({
@@ -9009,7 +9180,7 @@ var getSizeOfTreeNodeChild = (db, child) => {
 var Group_doInitialPcbLayoutFlex = (group) => {
   const { db } = group.root;
   const { _parsedProps: props } = group;
-  const tree = getCircuitJsonTree2(db.toArray(), {
+  const tree = getCircuitJsonTree3(db.toArray(), {
     source_group_id: group.source_group_id
   });
   const rawJustify = props.pcbJustifyContent ?? props.justifyContent;
@@ -9050,16 +9221,16 @@ var Group_doInitialPcbLayoutFlex = (group) => {
     rowGap = rawGap;
     columnGap = rawGap;
   } else if (typeof rawGap === "string") {
-    rowGap = length4.parse(rawGap);
-    columnGap = length4.parse(rawGap);
+    rowGap = length5.parse(rawGap);
+    columnGap = length5.parse(rawGap);
   }
   let minFlexContainer;
   let width = props.width ?? props.pcbWidth ?? void 0;
   let height = props.height ?? props.pcbHeight ?? void 0;
   const isInline = Boolean(width === void 0 || height === void 0);
   if (isInline) {
-    minFlexContainer = getMinimumFlexContainer(
-      tree.childNodes.map((child) => getSizeOfTreeNodeChild(db, child)).filter((size) => size !== null),
+    minFlexContainer = getMinimumFlexContainer2(
+      tree.childNodes.map((child) => getSizeOfTreeNodeChild2(db, child)).filter((size) => size !== null),
       {
         alignItems,
         justifyContent,
@@ -9071,7 +9242,7 @@ var Group_doInitialPcbLayoutFlex = (group) => {
     width = minFlexContainer.width;
     height = minFlexContainer.height;
   }
-  const flexBox = new RootFlexBox(width, height, {
+  const flexBox = new RootFlexBox2(width, height, {
     alignItems,
     justifyContent,
     direction,
@@ -9079,7 +9250,7 @@ var Group_doInitialPcbLayoutFlex = (group) => {
     columnGap
   });
   for (const child of tree.childNodes) {
-    const size = getSizeOfTreeNodeChild(db, child);
+    const size = getSizeOfTreeNodeChild2(db, child);
     flexBox.addChild({
       metadata: child,
       // TODO these should be minWidth/minHeight
@@ -9656,6 +9827,9 @@ var Group = class extends NormalComponent {
     if (props.schLayout?.matchAdapt) return "match-adapt";
     if (props.schLayout?.flex) return "flex";
     if (props.schLayout?.grid) return "grid";
+    if (props.schMatchAdapt) return "match-adapt";
+    if (props.schFlex) return "flex";
+    if (props.schGrid) return "grid";
     if (props.matchAdapt) return "match-adapt";
     if (props.flex) return "flex";
     if (props.grid) return "grid";
@@ -9677,6 +9851,9 @@ var Group = class extends NormalComponent {
     if (schematicLayoutMode === "grid") {
       this._doInitialSchematicLayoutGrid();
     }
+    if (schematicLayoutMode === "flex") {
+      this._doInitialSchematicLayoutFlex();
+    }
     this._insertSchematicBorder();
   }
   _doInitialSchematicLayoutMatchAdapt() {
@@ -9688,6 +9865,9 @@ var Group = class extends NormalComponent {
   _doInitialSchematicLayoutGrid() {
     Group_doInitialSchematicLayoutGrid(this);
   }
+  _doInitialSchematicLayoutFlex() {
+    Group_doInitialSchematicLayoutFlex(this);
+  }
   _getPcbLayoutMode() {
     const props = this._parsedProps;
     if (props.pcbLayout?.matchAdapt) return "match-adapt";
@@ -12331,7 +12511,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.626",
+  version: "0.0.627",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -12356,7 +12536,7 @@ var package_default = {
     "@biomejs/biome": "^1.8.3",
     "@tscircuit/capacity-autorouter": "^0.0.100",
     "@tscircuit/checks": "^0.0.68",
-    "@tscircuit/circuit-json-util": "^0.0.64",
+    "@tscircuit/circuit-json-util": "^0.0.65",
     "@tscircuit/footprinter": "^0.0.208",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.627",
+  "version": "0.0.628",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -26,7 +26,7 @@
     "@biomejs/biome": "^1.8.3",
     "@tscircuit/capacity-autorouter": "^0.0.100",
     "@tscircuit/checks": "^0.0.68",
-    "@tscircuit/circuit-json-util": "^0.0.64",
+    "@tscircuit/circuit-json-util": "^0.0.65",
     "@tscircuit/footprinter": "^0.0.208",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",