@tscircuit/core 0.0.143 → 0.0.145

package/dist/index.d.ts

@@ -3,10 +3,11 @@ import * as zod from 'zod';
 import { ZodType, z } from 'zod';
 import { SchSymbol, BaseSymbolName } from 'schematic-symbols';
 import { PcbTraceError, PcbPlacementError, LayerRef, AnyCircuitElement, AnySourceComponent, RouteHintPoint } from 'circuit-json';
-import { SoupUtilObjects } from '@tscircuit/soup-util';
 import { Matrix } from 'transformation-matrix';
+import { SoupUtilObjects } from '@tscircuit/soup-util';
 import * as _tscircuit_props from '@tscircuit/props';
 import { traceProps, groupProps, boardProps, capacitorProps, chipProps, diodeProps, jumperProps, ledProps, powerSourceProps, resistorProps, constraintProps, fabricationNotePathProps, fabricationNoteTextProps, footprintProps, holeProps, pcbKeepoutProps, netAliasProps, platedHoleProps, silkscreenCircleProps, silkscreenPathProps, silkscreenRectProps, silkscreenTextProps, smtPadProps, traceHintProps, viaProps, batteryProps, inductorProps, CapacitorProps, ChipProps, ResistorProps } from '@tscircuit/props';
+import * as _tscircuit_layout from '@tscircuit/layout';
 
 declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "InitializePortsFromChildren", "CreateNetsFromProps", "CreateTracesFromProps", "CreateTraceHintsFromProps", "SourceRender", "SourceParentAttachment", "PortDiscovery", "PortMatching", "SourceTraceRender", "SchematicComponentRender", "SchematicPortRender", "SchematicLayout", "SchematicTraceRender", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbLayout", "PcbTraceRender", "PcbTraceHintRender", "PcbRouteNetIslands", "PcbComponentSizeCalculation", "CadModelRender"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
@@ -833,7 +834,8 @@ declare class Board extends Group<typeof boardProps> {
             }>, "many">>;
             pcbX: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>>;
             pcbY: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>>;
-            layout: z.ZodOptional<z.ZodAny>;
+            layout: z.ZodOptional<z.ZodType<_tscircuit_layout.LayoutBuilder, z.ZodTypeDef, _tscircuit_layout.LayoutBuilder>>;
+            manualEdits: z.ZodOptional<z.ZodType<_tscircuit_layout.ManualEditFile, z.ZodTypeDef, _tscircuit_layout.ManualEditFile>>;
             routingDisabled: z.ZodOptional<z.ZodBoolean>;
             children: z.ZodAny;
             defaultTraceWidth: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
@@ -844,28 +846,30 @@ declare class Board extends Group<typeof boardProps> {
             children?: any;
             width?: number | undefined;
             height?: number | undefined;
-            layout?: any;
-            routingDisabled?: boolean | undefined;
-            defaultTraceWidth?: number | undefined;
-            schAutoLayoutEnabled?: boolean | undefined;
             outline?: {
                 x: number;
                 y: number;
             }[] | undefined;
+            layout?: _tscircuit_layout.LayoutBuilder | undefined;
+            manualEdits?: _tscircuit_layout.ManualEditFile | undefined;
+            routingDisabled?: boolean | undefined;
+            defaultTraceWidth?: number | undefined;
+            schAutoLayoutEnabled?: boolean | undefined;
         }, {
             pcbX?: string | number | undefined;
             pcbY?: string | number | undefined;
             children?: any;
             width?: string | number | undefined;
             height?: string | number | undefined;
-            layout?: any;
-            routingDisabled?: boolean | undefined;
-            defaultTraceWidth?: string | number | undefined;
-            schAutoLayoutEnabled?: boolean | undefined;
             outline?: {
                 x: string | number;
                 y: string | number;
             }[] | undefined;
+            layout?: _tscircuit_layout.LayoutBuilder | undefined;
+            manualEdits?: _tscircuit_layout.ManualEditFile | undefined;
+            routingDisabled?: boolean | undefined;
+            defaultTraceWidth?: string | number | undefined;
+            schAutoLayoutEnabled?: boolean | undefined;
         }>;
     };
     get boardThickness(): number;

package/dist/index.js

@@ -354,18 +354,32 @@ var createInstanceFromReactElement = (reactElm) => {
   return rootContainer.children[0];
 };
 
-// lib/components/base-components/PrimitiveComponent.ts
-import { z } from "zod";
-import { symbols } from "schematic-symbols";
-import "react";
-import {
-  applyToPoint,
-  compose,
-  flipY,
-  identity as identity2,
-  rotate,
-  translate
-} from "transformation-matrix";
+// lib/errors/InvalidProps.ts
+var InvalidProps = class extends Error {
+  constructor(componentName, originalProps, formattedError) {
+    let message;
+    const propsWithError = Object.keys(formattedError).filter(
+      (k) => k !== "_errors"
+    );
+    const propMessage = propsWithError.map((k) => {
+      if (formattedError[k]._errors[0]) {
+        return `${k} (${formattedError[k]._errors[0]})`;
+      }
+      return `${k} (${JSON.stringify(formattedError[k])})`;
+    }).join(", ");
+    if ("name" in originalProps) {
+      message = `Invalid props for ${componentName} "${originalProps.name}": ${propMessage}`;
+    } else if ("footprint" in originalProps && typeof originalProps.footprint === "string") {
+      message = `Invalid props for ${componentName} (unnamed ${originalProps.footprint} component): ${propMessage}`;
+    } else {
+      message = `Invalid props for ${componentName} (unnamed): ${propMessage}`;
+    }
+    super(message);
+    this.componentName = componentName;
+    this.originalProps = originalProps;
+    this.formattedError = formattedError;
+  }
+};
 
 // lib/utils/selector-matching/is-matching-selector.ts
 function isMatchingSelector(component, selector) {
@@ -396,34 +410,17 @@ function isMatchingSelector(component, selector) {
   });
 }
 
-// lib/errors/InvalidProps.ts
-var InvalidProps = class extends Error {
-  constructor(componentName, originalProps, formattedError) {
-    let message;
-    const propsWithError = Object.keys(formattedError).filter(
-      (k) => k !== "_errors"
-    );
-    const propMessage = propsWithError.map((k) => {
-      if (formattedError[k]._errors[0]) {
-        return `${k} (${formattedError[k]._errors[0]})`;
-      }
-      return `${k} (${JSON.stringify(formattedError[k])})`;
-    }).join(", ");
-    if ("name" in originalProps) {
-      message = `Invalid props for ${componentName} "${originalProps.name}": ${propMessage}`;
-    } else if ("footprint" in originalProps && typeof originalProps.footprint === "string") {
-      message = `Invalid props for ${componentName} (unnamed ${originalProps.footprint} component): ${propMessage}`;
-    } else {
-      message = `Invalid props for ${componentName} (unnamed): ${propMessage}`;
-    }
-    super(message);
-    this.componentName = componentName;
-    this.originalProps = originalProps;
-    this.formattedError = formattedError;
-  }
-};
-
 // lib/components/base-components/PrimitiveComponent.ts
+import { symbols } from "schematic-symbols";
+import {
+  applyToPoint,
+  compose,
+  flipY,
+  identity as identity2,
+  rotate,
+  translate
+} from "transformation-matrix";
+import { z } from "zod";
 var PrimitiveComponent = class extends Renderable {
   parent = null;
   children;
@@ -630,16 +627,17 @@ var PrimitiveComponent = class extends Renderable {
   _getManualPlacementForComponent(component) {
     if (!this.isSubcircuit) return null;
     const layout = this.props.layout;
-    if (!layout) return null;
-    const placementConfig = layout.manual_pcb_placement_config;
-    if (!placementConfig) return null;
-    for (const position of placementConfig.positions) {
-      if (isMatchingSelector(component, position.selector)) {
+    const manualEdits = this.props.manualEdits;
+    if (!layout && !manualEdits) return null;
+    const placementConfigPositions = layout?.manual_pcb_placement_config?.positions || manualEdits?.pcb_placements;
+    if (!placementConfigPositions) return null;
+    for (const position of placementConfigPositions) {
+      if (layout && isMatchingSelector(component, position.selector) || component.props.name === position.selector) {
         const center = applyToPoint(
           this._computePcbGlobalTransformBeforeLayout(),
           position.center
         );
-        return center;
+        return Array.isArray(center) ? { x: center[0], y: center[1] } : center;
       }
     }
     return null;
@@ -1802,7 +1800,7 @@ function getPortFromHints(hints) {
 
 // lib/components/base-components/NormalComponent.ts
 import {
-  isValidElement as isReactElement2,
+  isValidElement as isReactElement,
   isValidElement
 } from "react";
 import { symbols as symbols2 } from "schematic-symbols";
@@ -2265,7 +2263,7 @@ var NormalComponent = class extends PrimitiveComponent {
     this.initPorts();
   }
   doInitialReactSubtreesRender() {
-    if (isReactElement2(this.props.footprint)) {
+    if (isReactElement(this.props.footprint)) {
       if (this.reactSubtrees.some((rs) => rs.element === this.props.footprint))
         return;
       const subtree = this._renderReactSubtree(this.props.footprint);
@@ -2285,7 +2283,7 @@ var NormalComponent = class extends PrimitiveComponent {
   }
   add(componentOrElm) {
     let component;
-    if (isReactElement2(componentOrElm)) {
+    if (isReactElement(componentOrElm)) {
       const subtree = this._renderReactSubtree(componentOrElm);
       this.reactSubtrees.push(subtree);
       component = subtree.component;
@@ -2328,9 +2326,18 @@ var NormalComponent = class extends PrimitiveComponent {
     }
     if (!isValidElement(footprint) && footprint && footprint.componentName === "Footprint") {
       const fp2 = footprint;
+      let pinNumber = 1;
       const newPorts2 = [];
       for (const fpChild of fp2.children) {
-        const newPort = getPortFromHints(fpChild.props.portHints ?? []);
+        let portHintsList = fpChild.props.portHints ?? [];
+        const hasPinPrefix = portHintsList.some(
+          (hint) => hint.startsWith("pin")
+        );
+        if (!hasPinPrefix) {
+          portHintsList = [...portHintsList, `pin${pinNumber}`];
+        }
+        pinNumber++;
+        const newPort = getPortFromHints(portHintsList);
         if (!newPort) continue;
         newPort.originDescription = `footprint:${footprint}`;
         newPorts2.push(newPort);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.143",
+  "version": "0.0.145",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -40,7 +40,7 @@
     "@tscircuit/footprinter": "^0.0.77",
     "@tscircuit/infgrid-ijump-astar": "^0.0.24",
     "@tscircuit/math-utils": "^0.0.4",
-    "@tscircuit/props": "^0.0.77",
+    "@tscircuit/props": "^0.0.78",
     "@tscircuit/schematic-autolayout": "^0.0.5",
     "@tscircuit/soup-util": "^0.0.33",
     "circuit-json": "^0.0.91",