@tscircuit/core 0.0.474 → 0.0.476

package/dist/index.d.ts

@@ -1067,6 +1067,7 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     _getPcbLayoutMode(): "grid" | "flex" | "match-adapt" | "none";
     doInitialPcbLayout(): void;
     _doInitialPcbLayoutGrid(): void;
+    _insertSchematicBorder(): void;
     _determineSideFromPosition(port: SchematicPort, component: SchematicComponent): "left" | "right" | "top" | "bottom";
     _calculateSchematicBounds(boxes: Array<{
         centerX: number;
@@ -1248,7 +1249,7 @@ declare class Board extends Group<typeof boardProps> {
                 matchAdapt?: boolean | undefined;
                 matchAdaptTemplate?: any;
             }>>;
-            cellBorder: zod.ZodOptional<zod.ZodObject<{
+            cellBorder: zod.ZodOptional<zod.ZodNullable<zod.ZodObject<{
                 strokeWidth: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
                 dashed: zod.ZodOptional<zod.ZodBoolean>;
                 solid: zod.ZodOptional<zod.ZodBoolean>;
@@ -1260,7 +1261,25 @@ declare class Board extends Group<typeof boardProps> {
                 strokeWidth?: string | number | undefined;
                 dashed?: boolean | undefined;
                 solid?: boolean | undefined;
-            }>>;
+            }>>>;
+            border: zod.ZodOptional<zod.ZodNullable<zod.ZodObject<{
+                strokeWidth: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+                dashed: zod.ZodOptional<zod.ZodBoolean>;
+                solid: zod.ZodOptional<zod.ZodBoolean>;
+            }, "strip", zod.ZodTypeAny, {
+                strokeWidth?: number | undefined;
+                dashed?: boolean | undefined;
+                solid?: boolean | undefined;
+            }, {
+                strokeWidth?: string | number | undefined;
+                dashed?: boolean | undefined;
+                solid?: boolean | undefined;
+            }>>>;
+            schPadding: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+            schPaddingLeft: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+            schPaddingRight: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+            schPaddingTop: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+            schPaddingBottom: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             layoutMode: zod.ZodOptional<zod.ZodEnum<["grid", "flex", "match-adapt", "none"]>>;
             position: zod.ZodOptional<zod.ZodEnum<["absolute", "relative"]>>;
             grid: zod.ZodOptional<zod.ZodBoolean>;
@@ -1585,7 +1604,17 @@ declare class Board extends Group<typeof boardProps> {
                 strokeWidth?: number | undefined;
                 dashed?: boolean | undefined;
                 solid?: boolean | undefined;
-            } | undefined;
+            } | null | undefined;
+            border?: {
+                strokeWidth?: number | undefined;
+                dashed?: boolean | undefined;
+                solid?: boolean | undefined;
+            } | null | undefined;
+            schPadding?: number | undefined;
+            schPaddingLeft?: number | undefined;
+            schPaddingRight?: number | undefined;
+            schPaddingTop?: number | undefined;
+            schPaddingBottom?: number | undefined;
             layout?: _tscircuit_layout.LayoutBuilder | undefined;
             manualEdits?: {
                 pcb_placements?: {
@@ -1724,7 +1753,17 @@ declare class Board extends Group<typeof boardProps> {
                 strokeWidth?: string | number | undefined;
                 dashed?: boolean | undefined;
                 solid?: boolean | undefined;
-            } | undefined;
+            } | null | undefined;
+            border?: {
+                strokeWidth?: string | number | undefined;
+                dashed?: boolean | undefined;
+                solid?: boolean | undefined;
+            } | null | undefined;
+            schPadding?: string | number | undefined;
+            schPaddingLeft?: string | number | undefined;
+            schPaddingRight?: string | number | undefined;
+            schPaddingTop?: string | number | undefined;
+            schPaddingBottom?: string | number | undefined;
             layout?: _tscircuit_layout.LayoutBuilder | undefined;
             manualEdits?: {
                 pcb_placements?: {
@@ -4202,7 +4241,7 @@ declare class Fuse extends NormalComponent<typeof fuseProps, PassivePorts> {
 declare class Jumper<PinLabels extends string = never> extends NormalComponent<typeof jumperProps, PinLabels> {
     schematicDimensions: SchematicBoxDimensions | null;
     get config(): {
-        schematicSymbolName: string;
+        schematicSymbolName: undefined;
         componentName: string;
         zodProps: zod.ZodObject<{
             pcbX: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
@@ -7237,7 +7276,7 @@ declare class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
     isPcbPrimitive: boolean;
     get config(): {
         componentName: string;
-        zodProps: zod.ZodEffects<zod.ZodUnion<[zod.ZodObject<Omit<{
+        zodProps: zod.ZodEffects<zod.ZodDiscriminatedUnion<"shape", [zod.ZodObject<Omit<{
             pcbX: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             pcbY: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             pcbRotation: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
@@ -7366,7 +7405,7 @@ declare class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
             portHints?: (string | number)[] | undefined;
             innerWidth?: string | number | undefined;
             innerHeight?: string | number | undefined;
-        }>, zod.ZodEffects<zod.ZodObject<Omit<{
+        }>, zod.ZodObject<Omit<{
             pcbX: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             pcbY: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             pcbRotation: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
@@ -7381,54 +7420,32 @@ declare class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
             }>>;
         }, "pcbRotation" | "layer"> & {
             name: zod.ZodOptional<zod.ZodString>;
+            shape: zod.ZodLiteral<"circular_hole_with_rect_pad">;
             holeDiameter: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
             rectPadWidth: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
             rectPadHeight: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
             holeShape: zod.ZodOptional<zod.ZodLiteral<"circle">>;
             padShape: zod.ZodOptional<zod.ZodLiteral<"rect">>;
-            shape: zod.ZodOptional<zod.ZodLiteral<"circular_hole_with_rect_pad">>;
             portHints: zod.ZodOptional<zod.ZodArray<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, "many">>;
         }, "strip", zod.ZodTypeAny, {
+            shape: "circular_hole_with_rect_pad";
             holeDiameter: number;
             rectPadWidth: number;
             rectPadHeight: number;
             pcbX?: number | undefined;
             pcbY?: number | undefined;
             name?: string | undefined;
-            shape?: "circular_hole_with_rect_pad" | undefined;
-            portHints?: (string | number)[] | undefined;
-            holeShape?: "circle" | undefined;
-            padShape?: "rect" | undefined;
-        }, {
-            holeDiameter: string | number;
-            rectPadWidth: string | number;
-            rectPadHeight: string | number;
-            pcbX?: string | number | undefined;
-            pcbY?: string | number | undefined;
-            name?: string | undefined;
-            shape?: "circular_hole_with_rect_pad" | undefined;
-            portHints?: (string | number)[] | undefined;
-            holeShape?: "circle" | undefined;
-            padShape?: "rect" | undefined;
-        }>, {
-            holeDiameter: number;
-            rectPadWidth: number;
-            rectPadHeight: number;
-            pcbX?: number | undefined;
-            pcbY?: number | undefined;
-            name?: string | undefined;
-            shape?: "circular_hole_with_rect_pad" | undefined;
             portHints?: (string | number)[] | undefined;
             holeShape?: "circle" | undefined;
             padShape?: "rect" | undefined;
         }, {
+            shape: "circular_hole_with_rect_pad";
             holeDiameter: string | number;
             rectPadWidth: string | number;
             rectPadHeight: string | number;
             pcbX?: string | number | undefined;
             pcbY?: string | number | undefined;
             name?: string | undefined;
-            shape?: "circular_hole_with_rect_pad" | undefined;
             portHints?: (string | number)[] | undefined;
             holeShape?: "circle" | undefined;
             padShape?: "rect" | undefined;
@@ -7512,13 +7529,13 @@ declare class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
             innerWidth?: number | undefined;
             innerHeight?: number | undefined;
         } | {
+            shape: "circular_hole_with_rect_pad";
             holeDiameter: number;
             rectPadWidth: number;
             rectPadHeight: number;
             pcbX?: number | undefined;
             pcbY?: number | undefined;
             name?: string | undefined;
-            shape?: "circular_hole_with_rect_pad" | undefined;
             portHints?: (string | number)[] | undefined;
             holeShape?: "circle" | undefined;
             padShape?: "rect" | undefined;
@@ -7567,13 +7584,13 @@ declare class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
             innerWidth?: string | number | undefined;
             innerHeight?: string | number | undefined;
         } | {
+            shape: "circular_hole_with_rect_pad";
             holeDiameter: string | number;
             rectPadWidth: string | number;
             rectPadHeight: string | number;
             pcbX?: string | number | undefined;
             pcbY?: string | number | undefined;
             name?: string | undefined;
-            shape?: "circular_hole_with_rect_pad" | undefined;
             portHints?: (string | number)[] | undefined;
             holeShape?: "circle" | undefined;
             padShape?: "rect" | undefined;

package/dist/index.js

@@ -7639,6 +7639,7 @@ var Group = class extends NormalComponent {
     if (schematicLayoutMode === "grid") {
       this._doInitialSchematicLayoutGrid();
     }
+    this._insertSchematicBorder();
   }
   _doInitialSchematicLayoutMatchAdapt() {
     Group_doInitialSchematicLayoutMatchAdapt(this);
@@ -7665,6 +7666,41 @@ var Group = class extends NormalComponent {
   _doInitialPcbLayoutGrid() {
     Group_doInitialPcbLayoutGrid(this);
   }
+  _insertSchematicBorder() {
+    if (this.root?.schematicDisabled) return;
+    const { db } = this.root;
+    const props = this._parsedProps;
+    if (!props.border) return;
+    let width = typeof props.schWidth === "number" ? props.schWidth : void 0;
+    let height = typeof props.schHeight === "number" ? props.schHeight : void 0;
+    const paddingGeneral = typeof props.schPadding === "number" ? props.schPadding : 0;
+    const paddingLeft = typeof props.schPaddingLeft === "number" ? props.schPaddingLeft : paddingGeneral;
+    const paddingRight = typeof props.schPaddingRight === "number" ? props.schPaddingRight : paddingGeneral;
+    const paddingTop = typeof props.schPaddingTop === "number" ? props.schPaddingTop : paddingGeneral;
+    const paddingBottom = typeof props.schPaddingBottom === "number" ? props.schPaddingBottom : paddingGeneral;
+    const schematicGroup = this.schematic_group_id ? db.schematic_group.get(this.schematic_group_id) : null;
+    if (schematicGroup) {
+      if (width === void 0 && typeof schematicGroup.width === "number") {
+        width = schematicGroup.width;
+      }
+      if (height === void 0 && typeof schematicGroup.height === "number") {
+        height = schematicGroup.height;
+      }
+    }
+    if (width === void 0 || height === void 0) return;
+    const center = schematicGroup?.center ?? this._getGlobalSchematicPositionBeforeLayout();
+    const left = center.x - width / 2 - paddingLeft;
+    const bottom = center.y - height / 2 - paddingBottom;
+    const finalWidth = width + paddingLeft + paddingRight;
+    const finalHeight = height + paddingTop + paddingBottom;
+    db.schematic_box.insert({
+      width: finalWidth,
+      height: finalHeight,
+      x: left,
+      y: bottom,
+      is_dashed: props.border?.dashed ?? false
+    });
+  }
   _determineSideFromPosition(port, component) {
     if (!port.center || !component.center) return "left";
     const dx = port.center.x - component.center.x;
@@ -8145,10 +8181,8 @@ import { jumperProps } from "@tscircuit/props";
 var Jumper = class extends NormalComponent {
   schematicDimensions = null;
   get config() {
-    let symbolName = "";
-    if (this.props.pinCount) symbolName += `pinrow${this.props.pinCount || 2}`;
     return {
-      schematicSymbolName: symbolName,
+      schematicSymbolName: void 0,
       componentName: "Jumper",
       zodProps: jumperProps,
       shouldRenderAsSchematicBox: true
@@ -8249,9 +8283,20 @@ var SolderJumper = class extends NormalComponent {
     return this._parsedProps.bridgedPins ?? [];
   }
   get config() {
+    let resolvedPinCount = this.props.pinCount;
+    if (!resolvedPinCount) {
+      const nums = (this.props.bridgedPins ?? []).flat().map((p) => {
+        if (typeof p === "number") return p;
+        if (p.startsWith("pin")) return Number(p.slice(3));
+        return Number(p);
+      }).filter((n) => !Number.isNaN(n));
+      const maxPin = nums.length > 0 ? Math.max(...nums) : 0;
+      if (maxPin === 2 || maxPin === 3) {
+        resolvedPinCount = maxPin;
+      }
+    }
     let symbolName = "";
-    if (this.props.pinCount)
-      symbolName += `solderjumper${this.props.pinCount || 2}`;
+    if (resolvedPinCount) symbolName += `solderjumper${resolvedPinCount}`;
     if (Array.isArray(this.props.bridgedPins) && this.props.bridgedPins.length > 0) {
       const pins = Array.from(new Set(this.props.bridgedPins.flat())).sort().join("");
       symbolName += `_bridged${pins}`;
@@ -9801,8 +9846,7 @@ var SchematicBox = class extends PrimitiveComponent2 {
       width,
       x,
       y,
-      is_dashed: props.strokeStyle === "dashed",
-      schematic_component_id: ""
+      is_dashed: props.strokeStyle === "dashed"
     });
     if (props.title) {
       const isInside = props.titleInside ?? false;
@@ -9852,7 +9896,7 @@ import { identity as identity4 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.473",
+  version: "0.0.475",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -9884,7 +9928,7 @@ var package_default = {
     "@tscircuit/layout": "^0.0.28",
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/math-utils": "^0.0.18",
-    "@tscircuit/props": "^0.0.222",
+    "@tscircuit/props": "^0.0.227",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/simple-3d-svg": "^0.0.6",
@@ -9895,7 +9939,7 @@ var package_default = {
     "@types/react-reconciler": "^0.28.9",
     "bun-match-svg": "0.0.8",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.204",
+    "circuit-json": "^0.0.210",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.2",
     "circuit-to-svg": "^0.0.151",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.474",
+  "version": "0.0.476",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -33,7 +33,7 @@
     "@tscircuit/layout": "^0.0.28",
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/math-utils": "^0.0.18",
-    "@tscircuit/props": "^0.0.222",
+    "@tscircuit/props": "^0.0.227",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/simple-3d-svg": "^0.0.6",
@@ -44,7 +44,7 @@
     "@types/react-reconciler": "^0.28.9",
     "bun-match-svg": "0.0.8",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.204",
+    "circuit-json": "^0.0.210",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.2",
     "circuit-to-svg": "^0.0.151",