@tscircuit/core 0.0.613 → 0.0.615

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", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SchematicPrimitiveRender", "SchematicLayout", "SchematicTraceRender", "SchematicReplaceNetLabelsWithSymbols", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbLayout", "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", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SchematicPrimitiveRender", "SchematicLayout", "SchematicTraceRender", "SchematicReplaceNetLabelsWithSymbols", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbLayout", "PcbBoardAutoSize", "PcbTraceHintRender", "PcbManualTraceRender", "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, {
@@ -602,6 +602,17 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
                 } | undefined;
                 trace_width?: string | number | undefined;
             }>, "many">>;
+            pcbPathRelativeTo: z.ZodOptional<z.ZodString>;
+            pcbPath: z.ZodOptional<z.ZodArray<z.ZodObject<{
+                x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+                y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+            }, "strip", z.ZodTypeAny, {
+                x: number;
+                y: number;
+            }, {
+                x: string | number;
+                y: string | number;
+            }>, "many">>;
             schDisplayLabel: z.ZodOptional<z.ZodString>;
             maxLength: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
         } & {
@@ -628,6 +639,11 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
                 to_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
                 trace_width?: number | undefined;
             }[] | undefined;
+            pcbPathRelativeTo?: string | undefined;
+            pcbPath?: {
+                x: number;
+                y: number;
+            }[] | undefined;
             schDisplayLabel?: string | undefined;
         }, {
             path: (string | {
@@ -649,6 +665,11 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
                 } | undefined;
                 trace_width?: string | number | undefined;
             }[] | undefined;
+            pcbPathRelativeTo?: string | undefined;
+            pcbPath?: {
+                x: string | number;
+                y: string | number;
+            }[] | undefined;
             schDisplayLabel?: string | undefined;
         }>, z.ZodObject<{
             key: z.ZodOptional<z.ZodString>;
@@ -692,6 +713,17 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
                 } | undefined;
                 trace_width?: string | number | undefined;
             }>, "many">>;
+            pcbPathRelativeTo: z.ZodOptional<z.ZodString>;
+            pcbPath: z.ZodOptional<z.ZodArray<z.ZodObject<{
+                x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+                y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+            }, "strip", z.ZodTypeAny, {
+                x: number;
+                y: number;
+            }, {
+                x: string | number;
+                y: string | number;
+            }>, "many">>;
             schDisplayLabel: z.ZodOptional<z.ZodString>;
             maxLength: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
         } & {
@@ -726,6 +758,11 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
                 to_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
                 trace_width?: number | undefined;
             }[] | undefined;
+            pcbPathRelativeTo?: string | undefined;
+            pcbPath?: {
+                x: number;
+                y: number;
+            }[] | undefined;
             schDisplayLabel?: string | undefined;
         }, {
             from: string | {
@@ -750,6 +787,11 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
                 } | undefined;
                 trace_width?: string | number | undefined;
             }[] | undefined;
+            pcbPathRelativeTo?: string | undefined;
+            pcbPath?: {
+                x: string | number;
+                y: string | number;
+            }[] | undefined;
             schDisplayLabel?: string | undefined;
         }>]>;
         componentName: string;
@@ -795,6 +837,7 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
     _computeTraceConnectionHash(): string | null;
     doInitialSourceTraceRender(): void;
     _insertErrorIfTraceIsOutsideBoard(mergedRoute: PcbTraceRoutePoint[], ports: Port[]): void;
+    doInitialPcbManualTraceRender(): void;
     doInitialPcbTraceRender(): void;
     _doInitialSchematicTraceRenderWithDisplayLabel(): void;
     _isSymbolToChipConnection(): boolean | undefined;
@@ -967,6 +1010,7 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
     initPorts(opts?: {
         additionalAliases?: Record<`pin${number}`, string[]>;
         pinCount?: number;
+        ignoreSymbolPorts?: boolean;
     }): void;
     _getImpliedFootprintString(): string | null;
     _isFootprintUrl(s: string): boolean;
@@ -1162,6 +1206,25 @@ declare class Board extends Group<typeof boardProps> {
             pcbFlexColumn: zod.ZodOptional<zod.ZodBoolean>;
             pcbGap: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>>;
             pcbPack: zod.ZodOptional<zod.ZodBoolean>;
+            schGrid: zod.ZodOptional<zod.ZodBoolean>;
+            schGridCols: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>>;
+            schGridRows: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>>;
+            schGridTemplateRows: zod.ZodOptional<zod.ZodString>;
+            schGridTemplateColumns: zod.ZodOptional<zod.ZodString>;
+            schGridTemplate: zod.ZodOptional<zod.ZodString>;
+            schGridGap: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>>;
+            schGridRowGap: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>>;
+            schGridColumnGap: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>>;
+            schFlex: zod.ZodOptional<zod.ZodUnion<[zod.ZodBoolean, zod.ZodString]>>;
+            schFlexGap: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>>;
+            schFlexDirection: zod.ZodOptional<zod.ZodEnum<["row", "column"]>>;
+            schAlignItems: zod.ZodOptional<zod.ZodEnum<["start", "center", "end", "stretch"]>>;
+            schJustifyContent: zod.ZodOptional<zod.ZodEnum<["start", "center", "end", "stretch", "space-between", "space-around", "space-evenly"]>>;
+            schFlexRow: zod.ZodOptional<zod.ZodBoolean>;
+            schFlexColumn: zod.ZodOptional<zod.ZodBoolean>;
+            schGap: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>>;
+            schPack: zod.ZodOptional<zod.ZodBoolean>;
+            schMatchAdapt: 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>>;
@@ -1822,6 +1885,25 @@ declare class Board extends Group<typeof boardProps> {
             pcbFlexColumn?: boolean | undefined;
             pcbGap?: string | number | undefined;
             pcbPack?: boolean | undefined;
+            schGrid?: boolean | undefined;
+            schGridCols?: string | number | undefined;
+            schGridRows?: string | number | undefined;
+            schGridTemplateRows?: string | undefined;
+            schGridTemplateColumns?: string | undefined;
+            schGridTemplate?: string | undefined;
+            schGridGap?: string | number | undefined;
+            schGridRowGap?: string | number | undefined;
+            schGridColumnGap?: string | number | undefined;
+            schFlex?: string | boolean | undefined;
+            schFlexGap?: string | number | undefined;
+            schFlexDirection?: "row" | "column" | undefined;
+            schAlignItems?: "center" | "start" | "end" | "stretch" | undefined;
+            schJustifyContent?: "center" | "start" | "end" | "stretch" | "space-between" | "space-around" | "space-evenly" | undefined;
+            schFlexRow?: boolean | undefined;
+            schFlexColumn?: boolean | undefined;
+            schGap?: string | number | undefined;
+            schPack?: boolean | undefined;
+            schMatchAdapt?: boolean | undefined;
             manualEdits?: {
                 pcb_placements?: {
                     selector: string;
@@ -2038,6 +2120,25 @@ declare class Board extends Group<typeof boardProps> {
             pcbFlexColumn?: boolean | undefined;
             pcbGap?: string | number | undefined;
             pcbPack?: boolean | undefined;
+            schGrid?: boolean | undefined;
+            schGridCols?: string | number | undefined;
+            schGridRows?: string | number | undefined;
+            schGridTemplateRows?: string | undefined;
+            schGridTemplateColumns?: string | undefined;
+            schGridTemplate?: string | undefined;
+            schGridGap?: string | number | undefined;
+            schGridRowGap?: string | number | undefined;
+            schGridColumnGap?: string | number | undefined;
+            schFlex?: string | boolean | undefined;
+            schFlexGap?: string | number | undefined;
+            schFlexDirection?: "row" | "column" | undefined;
+            schAlignItems?: "center" | "start" | "end" | "stretch" | undefined;
+            schJustifyContent?: "center" | "start" | "end" | "stretch" | "space-between" | "space-around" | "space-evenly" | undefined;
+            schFlexRow?: boolean | undefined;
+            schFlexColumn?: boolean | undefined;
+            schGap?: string | number | undefined;
+            schPack?: boolean | undefined;
+            schMatchAdapt?: boolean | undefined;
             manualEdits?: {
                 pcb_placements?: {
                     selector: string;

package/dist/index.js

@@ -114,6 +114,7 @@ var orderedRenderPhases = [
   "PcbLayout",
   "PcbBoardAutoSize",
   "PcbTraceHintRender",
+  "PcbManualTraceRender",
   "PcbTraceRender",
   "PcbRouteNetIslands",
   "PcbDesignRuleChecks",
@@ -5440,6 +5441,9 @@ function Trace_doInitialPcbTraceRender(trace) {
     trace.pcb_trace_id = pcb_trace2.pcb_trace_id;
     return;
   }
+  if (props.pcbPath && props.pcbPath.length > 0) {
+    return;
+  }
   if (!subcircuit._shouldUseTraceByTraceRouting()) {
     return;
   }
@@ -5694,6 +5698,88 @@ function Trace_doInitialPcbTraceRender(trace) {
   trace._insertErrorIfTraceIsOutsideBoard(mergedRoute, ports);
 }
 
+// lib/components/primitive-components/Trace/Trace_doInitialPcbManualTraceRender.ts
+function Trace_doInitialPcbManualTraceRender(trace) {
+  if (trace.root?.pcbDisabled) return;
+  const { db } = trace.root;
+  const { _parsedProps: props } = trace;
+  const subcircuit = trace.getSubcircuit();
+  if (!props.pcbPath || props.pcbPath.length === 0) return;
+  const { allPortsFound, ports, portsWithSelectors } = trace._findConnectedPorts();
+  if (!allPortsFound) return;
+  const portsWithoutMatchedPcbPrimitive = [];
+  for (const port of ports) {
+    if (!port._hasMatchedPcbPrimitive()) {
+      portsWithoutMatchedPcbPrimitive.push(port);
+    }
+  }
+  if (portsWithoutMatchedPcbPrimitive.length > 0) {
+    db.pcb_trace_error.insert({
+      error_type: "pcb_trace_error",
+      source_trace_id: trace.source_trace_id,
+      message: `Some ports did not have a matching PCB primitive (e.g. a pad or plated hole), this can happen if a footprint is missing. As a result, ${trace} wasn't routed. Missing ports: ${portsWithoutMatchedPcbPrimitive.map((p) => p.getString()).join(", ")}`,
+      pcb_trace_id: trace.pcb_trace_id,
+      pcb_component_ids: [],
+      pcb_port_ids: portsWithoutMatchedPcbPrimitive.map((p) => p.pcb_port_id).filter(Boolean)
+    });
+    return;
+  }
+  let anchorPort;
+  if (props.pcbPathRelativeTo) {
+    anchorPort = portsWithSelectors.find(
+      (p) => p.selector === props.pcbPathRelativeTo
+    )?.port;
+    if (!anchorPort) {
+      anchorPort = trace.getSubcircuit().selectOne(props.pcbPathRelativeTo);
+    }
+  }
+  if (!anchorPort) {
+    anchorPort = ports[0];
+  }
+  const otherPort = ports.find((p) => p !== anchorPort) ?? ports[1];
+  const layer = anchorPort.getAvailablePcbLayers()[0] || "top";
+  const width = props.thickness ?? trace.getSubcircuit()._parsedProps.minTraceWidth ?? 0.16;
+  const anchorPos = anchorPort._getGlobalPcbPositionAfterLayout();
+  const otherPos = otherPort._getGlobalPcbPositionAfterLayout();
+  const route = [];
+  route.push({
+    route_type: "wire",
+    x: anchorPos.x,
+    y: anchorPos.y,
+    width,
+    layer,
+    start_pcb_port_id: anchorPort.pcb_port_id
+  });
+  for (const pt of props.pcbPath) {
+    route.push({
+      route_type: "wire",
+      x: anchorPos.x + pt.x,
+      y: anchorPos.y + pt.y,
+      width,
+      layer
+    });
+  }
+  route.push({
+    route_type: "wire",
+    x: otherPos.x,
+    y: otherPos.y,
+    width,
+    layer,
+    end_pcb_port_id: otherPort.pcb_port_id
+  });
+  const traceLength = getTraceLength(route);
+  const pcb_trace = db.pcb_trace.insert({
+    route,
+    source_trace_id: trace.source_trace_id,
+    subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+    pcb_group_id: trace.getGroup()?.pcb_group_id ?? void 0,
+    trace_length: traceLength
+  });
+  trace._portsRoutedOnPcb = ports;
+  trace.pcb_trace_id = pcb_trace.pcb_trace_id;
+  trace._insertErrorIfTraceIsOutsideBoard(route, ports);
+}
+
 // lib/components/primitive-components/Trace/Trace__doInitialSchematicTraceRenderWithDisplayLabel.ts
 function Trace__doInitialSchematicTraceRenderWithDisplayLabel(trace) {
   if (trace.root?.schematicDisabled) return;
@@ -6035,6 +6121,9 @@ var Trace3 = class extends PrimitiveComponent2 {
       });
     }
   }
+  doInitialPcbManualTraceRender() {
+    Trace_doInitialPcbManualTraceRender(this);
+  }
   doInitialPcbTraceRender() {
     Trace_doInitialPcbTraceRender(this);
   }
@@ -6192,7 +6281,7 @@ var NormalComponent = class extends PrimitiveComponent2 {
         }
       }
     }
-    if (config.schematicSymbolName) {
+    if (config.schematicSymbolName && !opts.ignoreSymbolPorts) {
       const sym = symbols2[this._getSchematicSymbolNameOrThrow()];
       if (!sym) return;
       for (const symPort of sym.ports) {
@@ -6228,9 +6317,18 @@ var NormalComponent = class extends PrimitiveComponent2 {
         }
       }
     }
-    for (let pn = 1; pn <= (opts.pinCount ?? this._getPinCount()); pn++) {
-      if (!schPortArrangement) continue;
+    const requiredPinCount = opts.pinCount ?? this._getPinCount() ?? 0;
+    for (let pn = 1; pn <= requiredPinCount; pn++) {
       if (portsToCreate.find((p) => p._parsedProps.pinNumber === pn)) continue;
+      if (!schPortArrangement) {
+        portsToCreate.push(
+          new Port({
+            pinNumber: pn,
+            aliases: opts.additionalAliases?.[`pin${pn}`] ?? []
+          })
+        );
+        continue;
+      }
       let explicitlyListedPinNumbersInSchPortArrangement = [
         ...schPortArrangement.leftSide?.pins ?? [],
         ...schPortArrangement.rightSide?.pins ?? [],
@@ -10917,6 +11015,7 @@ var Potentiometer = class extends NormalComponent {
 
 // lib/components/normal-components/PushButton.ts
 import { pushButtonProps } from "@tscircuit/props";
+import { symbols as symbols3 } from "schematic-symbols";
 var PushButton = class extends NormalComponent {
   get config() {
     return {
@@ -10927,19 +11026,44 @@ var PushButton = class extends NormalComponent {
     };
   }
   get defaultInternallyConnectedPinNames() {
-    return [
-      ["pin1", "pin4"],
-      ["pin2", "pin3"]
-    ];
+    return [];
   }
   initPorts() {
     super.initPorts({
-      pinCount: 4,
-      additionalAliases: {
-        pin1: ["side1"],
-        pin3: ["side2"]
-      }
+      pinCount: 2,
+      ignoreSymbolPorts: true
     });
+    const symbol = symbols3[this._getSchematicSymbolNameOrThrow()];
+    const symPort1 = symbol.ports.find((p) => p.labels.includes("1"));
+    const symPort2 = symbol.ports.find((p) => p.labels.includes("2"));
+    const ports = this.selectAll("port");
+    const pin1Port = ports.find((p) => p.props.pinNumber === 1);
+    const pin2Port = ports.find((p) => p.props.pinNumber === 2);
+    const pin3Port = ports.find((p) => p.props.pinNumber === 3);
+    const pin4Port = ports.find((p) => p.props.pinNumber === 4);
+    const { internallyConnectedPins } = this._parsedProps;
+    pin1Port.schematicSymbolPortDef = symPort1;
+    if (!internallyConnectedPins || internallyConnectedPins.length === 0) {
+      pin2Port.schematicSymbolPortDef = symPort2;
+    }
+    for (const [pn, port] of [
+      [2, pin2Port],
+      [3, pin3Port],
+      [4, pin4Port]
+    ]) {
+      const internallyConnectedRow = internallyConnectedPins?.find(
+        ([pin1, pin2]) => pin1 === `pin${pn}` || pin2 === `pin${pn}`
+      );
+      if (!internallyConnectedRow) {
+        port.schematicSymbolPortDef = symPort2;
+        break;
+      }
+      const internallyConnectedTo = internallyConnectedRow?.[0] === `pin${pn}` ? internallyConnectedRow[1] : internallyConnectedRow?.[0];
+      if (internallyConnectedTo === "pin1") {
+        continue;
+      }
+      port.schematicSymbolPortDef = symPort2;
+    }
   }
   doInitialSourceRender() {
     const { db } = this.root;
@@ -11612,7 +11736,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.612",
+  version: "0.0.614",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -11644,7 +11768,7 @@ var package_default = {
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/math-utils": "^0.0.18",
     "@tscircuit/miniflex": "^0.0.4",
-    "@tscircuit/props": "^0.0.278",
+    "@tscircuit/props": "^0.0.281",
     "@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.613",
+  "version": "0.0.615",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -33,7 +33,7 @@
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/math-utils": "^0.0.18",
     "@tscircuit/miniflex": "^0.0.4",
-    "@tscircuit/props": "^0.0.278",
+    "@tscircuit/props": "^0.0.281",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-corpus": "^0.0.110",
     "@tscircuit/schematic-match-adapt": "^0.0.16",