@tscircuit/core 0.0.605 → 0.0.607

package/dist/index.d.ts

@@ -11,7 +11,7 @@ import { CircuitJsonUtilObjects } from '@tscircuit/circuit-json-util';
 import { ConnectivityMap } from 'circuit-json-to-connectivity-map';
 import { GraphicsObject } from 'graphics-debug';
 
-declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "PcbFootprintStringRender", "InitializePortsFromChildren", "CreateNetsFromProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SchematicComponentRender", "SchematicPortRender", "SchematicPrimitiveRender", "SchematicLayout", "SchematicTraceRender", "SchematicReplaceNetLabelsWithSymbols", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbLayout", "PcbComponentSizeCalculation", "PcbBoardAutoSize", "PcbTraceHintRender", "PcbTraceRender", "PcbRouteNetIslands", "PcbDesignRuleChecks", "CadModelRender", "PartsEngineRender"];
+declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "PcbFootprintStringRender", "InitializePortsFromChildren", "CreateNetsFromProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SchematicComponentRender", "SchematicPortRender", "SchematicPrimitiveRender", "SchematicLayout", "SchematicTraceRender", "SchematicReplaceNetLabelsWithSymbols", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbLayout", "PcbBoardAutoSize", "PcbTraceHintRender", "PcbTraceRender", "PcbRouteNetIslands", "PcbDesignRuleChecks", "CadModelRender", "PartsEngineRender"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
 type RenderPhaseFn<K extends RenderPhase = RenderPhase> = `doInitial${K}` | `update${K}` | `remove${K}`;
 type RenderPhaseStates = Record<RenderPhase, {
@@ -1154,6 +1154,7 @@ declare class Board extends Group<typeof boardProps> {
             pcbGridRowGap: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>>;
             pcbGridColumnGap: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>>;
             pcbFlex: zod.ZodOptional<zod.ZodUnion<[zod.ZodBoolean, zod.ZodString]>>;
+            pcbFlexGap: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>>;
             pcbFlexDirection: zod.ZodOptional<zod.ZodEnum<["row", "column"]>>;
             pcbAlignItems: zod.ZodOptional<zod.ZodEnum<["start", "center", "end", "stretch"]>>;
             pcbJustifyContent: zod.ZodOptional<zod.ZodEnum<["start", "center", "end", "stretch", "space-between", "space-around", "space-evenly"]>>;
@@ -1803,6 +1804,7 @@ declare class Board extends Group<typeof boardProps> {
             pcbGridRowGap?: string | number | undefined;
             pcbGridColumnGap?: string | number | undefined;
             pcbFlex?: string | boolean | undefined;
+            pcbFlexGap?: string | number | undefined;
             pcbFlexDirection?: "row" | "column" | undefined;
             pcbAlignItems?: "center" | "start" | "end" | "stretch" | undefined;
             pcbJustifyContent?: "center" | "start" | "end" | "stretch" | "space-between" | "space-around" | "space-evenly" | undefined;
@@ -2013,6 +2015,7 @@ declare class Board extends Group<typeof boardProps> {
             pcbGridRowGap?: string | number | undefined;
             pcbGridColumnGap?: string | number | undefined;
             pcbFlex?: string | boolean | undefined;
+            pcbFlexGap?: string | number | undefined;
             pcbFlexDirection?: "row" | "column" | undefined;
             pcbAlignItems?: "center" | "start" | "end" | "stretch" | undefined;
             pcbJustifyContent?: "center" | "start" | "end" | "stretch" | "space-between" | "space-around" | "space-evenly" | undefined;

package/dist/index.js

@@ -109,8 +109,8 @@ var orderedRenderPhases = [
   "PcbFootprintLayout",
   "PcbPortRender",
   "PcbPortAttachment",
-  "PcbLayout",
   "PcbComponentSizeCalculation",
+  "PcbLayout",
   "PcbBoardAutoSize",
   "PcbTraceHintRender",
   "PcbTraceRender",
@@ -4154,7 +4154,7 @@ var getMaxLengthFromConnectedCapacitors = (ports, { db }) => {
       return sourceComponent.max_decoupling_trace_length;
     }
     return null;
-  }).filter((length4) => length4 !== null);
+  }).filter((length5) => length5 !== null);
   if (capacitorMaxLengths.length === 0) return void 0;
   return Math.min(...capacitorMaxLengths);
 };
@@ -8284,39 +8284,172 @@ var Group_doInitialPcbLayoutPack = (group) => {
 };
 
 // lib/components/primitive-components/Group/Group_doInitialPcbLayoutFlex.ts
-import { buildSubtree as buildSubtree3 } from "@tscircuit/circuit-json-util";
-import { layoutCircuitJsonWithFlex } from "@tscircuit/circuit-json-flex";
+import "@tscircuit/circuit-json-flex";
+import {
+  getCircuitJsonTree,
+  repositionPcbComponentTo,
+  repositionPcbGroupTo
+} from "@tscircuit/circuit-json-util";
+import { RootFlexBox } from "@tscircuit/miniflex";
+import { getMinimumFlexContainer } from "@tscircuit/circuit-json-flex";
+import { length as length4 } from "circuit-json";
+var getSizeOfTreeNodeChild = (db, child) => {
+  const { sourceComponent, sourceGroup } = child;
+  if (child.nodeType === "component") {
+    const pcbComponent = db.pcb_component.getWhere({
+      source_component_id: sourceComponent?.source_component_id
+    });
+    if (!pcbComponent) return null;
+    return {
+      width: pcbComponent.width,
+      height: pcbComponent.height
+    };
+  }
+  if (child.nodeType === "group") {
+    const pcbGroup = db.pcb_group.getWhere({
+      source_group_id: sourceGroup?.source_group_id
+    });
+    if (!pcbGroup) return null;
+    return {
+      width: pcbGroup.width,
+      height: pcbGroup.height
+    };
+  }
+  return null;
+};
 var Group_doInitialPcbLayoutFlex = (group) => {
   const { db } = group.root;
   const { _parsedProps: props } = group;
-  const circuitJson = group.lowercaseComponentName === "board" ? db.toArray() : buildSubtree3(db.toArray(), {
+  const tree = getCircuitJsonTree(db.toArray(), {
     source_group_id: group.source_group_id
   });
-  const justify = props.pcbJustifyContent ?? props.justifyContent;
-  const align = props.pcbAlignItems ?? props.alignItems;
-  const modifiedCircuitJson = layoutCircuitJsonWithFlex(circuitJson, {
-    justifyContent: justify === "start" ? "flex-start" : justify === "end" ? "flex-end" : justify === "stretch" ? "space-between" : justify ?? "space-between",
-    alignItems: align === "start" ? "flex-start" : align === "end" ? "flex-end" : align ?? "center"
-  });
-  const pcbSmtPads = db.pcb_smtpad.list();
-  for (const smtpad of pcbSmtPads) {
-    const modifiedElm = modifiedCircuitJson.find(
-      (elm) => elm.type === "pcb_smtpad" && elm.pcb_smtpad_id === smtpad.pcb_smtpad_id
-    );
-    if (!modifiedElm) continue;
-    db.pcb_smtpad.update(smtpad.pcb_smtpad_id, modifiedElm);
-  }
-  const pcbSilkScreenTexts = db.pcb_silkscreen_text.list();
-  for (const silkscreenText of pcbSilkScreenTexts) {
-    const modifiedElm = modifiedCircuitJson.find(
-      (elm) => elm.type === "pcb_silkscreen_text" && elm.pcb_silkscreen_text_id === silkscreenText.pcb_silkscreen_text_id
-    );
-    if (!modifiedElm) continue;
-    db.pcb_silkscreen_text.update(
-      silkscreenText.pcb_silkscreen_text_id,
-      modifiedElm
+  const rawJustify = props.pcbJustifyContent ?? props.justifyContent;
+  const rawAlign = props.pcbAlignItems ?? props.alignItems;
+  const rawGap = props.pcbFlexGap ?? props.pcbGap ?? props.gap;
+  const direction = props.pcbFlexDirection ?? "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 = length4.parse(rawGap);
+    columnGap = length4.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),
+      {
+        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,
+      // TODO these should be minWidth/minHeight
+      width: size?.width ?? 0,
+      height: size?.height ?? 0,
+      // TODO allow overriding flexBasis
+      flexBasis: !size ? void 0 : direction === "row" ? size.width : size.height
+      // TODO alignSelf, flexGrow, flexShrink etc.
+    });
+  }
+  flexBox.build();
+  const allCircuitJson = db.toArray();
+  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
+  };
+  for (const child of flexBox.children) {
+    const { sourceComponent, sourceGroup } = child.metadata;
+    if (sourceComponent) {
+      const pcbComponent = db.pcb_component.getWhere({
+        source_component_id: sourceComponent.source_component_id
+      });
+      if (!pcbComponent) continue;
+      repositionPcbComponentTo(allCircuitJson, pcbComponent.pcb_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 pcbGroup = db.pcb_group.getWhere({
+        source_group_id: sourceGroup.source_group_id
+      });
+      if (!pcbGroup) continue;
+      repositionPcbGroupTo(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
+      });
+    }
   }
+  db.pcb_group.update(group.pcb_group_id, {
+    width: bounds.width,
+    height: bounds.height
+  });
 };
 
 // lib/components/primitive-components/Group/Group.ts
@@ -8376,7 +8509,7 @@ var Group = class extends NormalComponent {
     const { _parsedProps: props } = this;
     const pcb_group = db.pcb_group.insert({
       is_subcircuit: this.isSubcircuit,
-      subcircuit_id: this.subcircuit_id,
+      subcircuit_id: this.subcircuit_id ?? this.getSubcircuit()?.subcircuit_id,
       name: this.name,
       center: this._getGlobalPcbPositionBeforeLayout(),
       width: 0,
@@ -9084,6 +9217,7 @@ var Board = class extends Group {
     let maxY = -Infinity;
     const descendantIds = getDescendantSubcircuitIds(db, this.subcircuit_id);
     const allowedSubcircuitIds = /* @__PURE__ */ new Set([this.subcircuit_id, ...descendantIds]);
+    console.log({ allowedSubcircuitIds });
     const allPcbComponents = db.pcb_component.list().filter(
       (c) => c.subcircuit_id && allowedSubcircuitIds.has(c.subcircuit_id)
     );
@@ -11370,7 +11504,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.604",
+  version: "0.0.606",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -11395,13 +11529,14 @@ var package_default = {
     "@biomejs/biome": "^1.8.3",
     "@tscircuit/capacity-autorouter": "^0.0.100",
     "@tscircuit/checks": "^0.0.64",
-    "@tscircuit/circuit-json-util": "^0.0.61",
+    "@tscircuit/circuit-json-util": "^0.0.62",
     "@tscircuit/footprinter": "^0.0.208",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/math-utils": "^0.0.18",
-    "@tscircuit/props": "^0.0.275",
+    "@tscircuit/miniflex": "^0.0.4",
+    "@tscircuit/props": "^0.0.276",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-corpus": "^0.0.110",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
@@ -11431,6 +11566,7 @@ var package_default = {
     "react-dom": "^19.1.0",
     "schematic-symbols": "^0.0.180",
     "ts-expect": "^1.3.0",
+    "@tscircuit/circuit-json-flex": "^0.0.3",
     tsup: "^8.2.4"
   },
   peerDependencies: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.605",
+  "version": "0.0.607",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -26,13 +26,14 @@
     "@biomejs/biome": "^1.8.3",
     "@tscircuit/capacity-autorouter": "^0.0.100",
     "@tscircuit/checks": "^0.0.64",
-    "@tscircuit/circuit-json-util": "^0.0.61",
+    "@tscircuit/circuit-json-util": "^0.0.62",
     "@tscircuit/footprinter": "^0.0.208",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/math-utils": "^0.0.18",
-    "@tscircuit/props": "^0.0.275",
+    "@tscircuit/miniflex": "^0.0.4",
+    "@tscircuit/props": "^0.0.276",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-corpus": "^0.0.110",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
@@ -62,6 +63,7 @@
     "react-dom": "^19.1.0",
     "schematic-symbols": "^0.0.180",
     "ts-expect": "^1.3.0",
+    "@tscircuit/circuit-json-flex": "^0.0.3",
     "tsup": "^8.2.4"
   },
   "peerDependencies": {