@tscircuit/core 0.0.604 → 0.0.606

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,12 +1154,14 @@ 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"]>>;
             pcbFlexRow: zod.ZodOptional<zod.ZodBoolean>;
             pcbFlexColumn: zod.ZodOptional<zod.ZodBoolean>;
             pcbGap: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>>;
+            pcbPack: zod.ZodOptional<zod.ZodBoolean>;
             pcbWidth: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             pcbHeight: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             schWidth: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
@@ -1802,12 +1804,14 @@ 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;
             pcbFlexRow?: boolean | undefined;
             pcbFlexColumn?: boolean | undefined;
             pcbGap?: string | number | undefined;
+            pcbPack?: boolean | undefined;
             manualEdits?: {
                 pcb_placements?: {
                     selector: string;
@@ -2011,12 +2015,14 @@ 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;
             pcbFlexRow?: boolean | undefined;
             pcbFlexColumn?: boolean | undefined;
             pcbGap?: string | number | undefined;
+            pcbPack?: boolean | undefined;
             manualEdits?: {
                 pcb_placements?: {
                     selector: string;

package/dist/index.js

@@ -109,8 +109,8 @@ var orderedRenderPhases = [
   "PcbFootprintLayout",
   "PcbPortRender",
   "PcbPortAttachment",
-  "PcbLayout",
   "PcbComponentSizeCalculation",
+  "PcbLayout",
   "PcbBoardAutoSize",
   "PcbTraceHintRender",
   "PcbTraceRender",
@@ -7921,10 +7921,14 @@ function Group_doInitialSchematicLayoutGrid(group) {
   let gridColsOption = props.gridCols;
   let gridRowsOption = void 0;
   let gridGapOption = props.gridGap;
+  let gridRowGapOption = props.gridRowGap;
+  let gridColumnGapOption = props.gridColumnGap;
   if (props.schLayout?.grid) {
     gridColsOption = props.schLayout.grid.cols ?? gridColsOption;
     gridRowsOption = props.schLayout.grid.rows;
     gridGapOption = props.schLayout.gridGap ?? gridGapOption;
+    gridRowGapOption = props.schLayout.gridRowGap ?? gridRowGapOption;
+    gridColumnGapOption = props.schLayout.gridColumnGap ?? gridColumnGapOption;
   }
   let numCols;
   let numRows;
@@ -7946,7 +7950,16 @@ function Group_doInitialSchematicLayoutGrid(group) {
     numRows = schematicChildren.length;
   let gridGapX;
   let gridGapY;
-  if (typeof gridGapOption === "number") {
+  const parseGap = (val) => {
+    if (val === void 0) return void 0;
+    return typeof val === "number" ? val : length.parse(val);
+  };
+  if (gridRowGapOption !== void 0 || gridColumnGapOption !== void 0) {
+    const fallbackX = typeof gridGapOption === "object" && gridGapOption !== null ? gridGapOption.x : gridGapOption;
+    const fallbackY = typeof gridGapOption === "object" && gridGapOption !== null ? gridGapOption.y : gridGapOption;
+    gridGapX = parseGap(gridColumnGapOption ?? fallbackX) ?? 1;
+    gridGapY = parseGap(gridRowGapOption ?? fallbackY) ?? 1;
+  } else if (typeof gridGapOption === "number") {
     gridGapX = gridGapOption;
     gridGapY = gridGapOption;
   } else if (typeof gridGapOption === "string") {
@@ -8052,10 +8065,14 @@ function Group_doInitialPcbLayoutGrid(group) {
   let gridColsOption = props.pcbGridCols ?? props.gridCols;
   let gridRowsOption = props.pcbGridRows;
   let gridGapOption = props.pcbGridGap ?? props.gridGap;
+  let gridRowGapOption = props.pcbGridRowGap ?? props.gridRowGap;
+  let gridColumnGapOption = props.pcbGridColumnGap ?? props.gridColumnGap;
   if (props.pcbLayout?.grid) {
     gridColsOption = props.pcbLayout.grid.cols ?? gridColsOption;
     gridRowsOption = props.pcbLayout.grid.rows;
     gridGapOption = props.pcbLayout.gridGap ?? gridGapOption;
+    gridRowGapOption = props.pcbLayout.gridRowGap ?? gridRowGapOption;
+    gridColumnGapOption = props.pcbLayout.gridColumnGap ?? gridColumnGapOption;
   }
   let numCols;
   let numRows;
@@ -8076,7 +8093,16 @@ function Group_doInitialPcbLayoutGrid(group) {
   if (numRows === 0 && pcbChildren.length > 0) numRows = pcbChildren.length;
   let gridGapX;
   let gridGapY;
-  if (typeof gridGapOption === "number") {
+  const parseGap = (val) => {
+    if (val === void 0) return void 0;
+    return typeof val === "number" ? val : length2.parse(val);
+  };
+  if (gridRowGapOption !== void 0 || gridColumnGapOption !== void 0) {
+    const fallbackX = typeof gridGapOption === "object" && gridGapOption !== null ? gridGapOption.x : gridGapOption;
+    const fallbackY = typeof gridGapOption === "object" && gridGapOption !== null ? gridGapOption.y : gridGapOption;
+    gridGapX = parseGap(gridColumnGapOption ?? fallbackX) ?? 1;
+    gridGapY = parseGap(gridRowGapOption ?? fallbackY) ?? 1;
+  } else if (typeof gridGapOption === "number") {
     gridGapX = gridGapOption;
     gridGapY = gridGapOption;
   } else if (typeof gridGapOption === "string") {
@@ -8268,9 +8294,14 @@ var Group_doInitialPcbLayoutFlex = (group) => {
   });
   const justify = props.pcbJustifyContent ?? props.justifyContent;
   const align = props.pcbAlignItems ?? props.alignItems;
+  const gap = props.pcbFlexGap ?? props.pcbGap ?? props.gap;
+  const direction = props.pcbFlexDirection ?? "row";
   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"
+    alignItems: align === "start" ? "flex-start" : align === "end" ? "flex-end" : align ?? "center",
+    direction,
+    columnGap: typeof gap === "number" ? gap : 0,
+    rowGap: typeof gap === "number" ? gap : 0
   });
   const pcbSmtPads = db.pcb_smtpad.list();
   for (const smtpad of pcbSmtPads) {
@@ -8848,6 +8879,7 @@ var Group = class extends NormalComponent {
     if (props.pcbLayout?.pack) return "pack";
     if (props.pcbFlex) return "flex";
     if (props.pcbGrid) return "grid";
+    if (props.pcbPack) return "pack";
     if (props.pack) return "pack";
     if (props.matchAdapt) return "match-adapt";
     if (props.flex) return "flex";
@@ -11343,7 +11375,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.603",
+  version: "0.0.605",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -11374,7 +11406,7 @@ var package_default = {
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/math-utils": "^0.0.18",
-    "@tscircuit/props": "^0.0.274",
+    "@tscircuit/props": "^0.0.276",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-corpus": "^0.0.110",
     "@tscircuit/schematic-match-adapt": "^0.0.16",

package/package.json

@@ -1,7 +1,7 @@
 {
   "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",
@@ -32,7 +32,7 @@
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/math-utils": "^0.0.18",
-    "@tscircuit/props": "^0.0.274",
+    "@tscircuit/props": "^0.0.276",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-corpus": "^0.0.110",
     "@tscircuit/schematic-match-adapt": "^0.0.16",