@tscircuit/core 0.0.53 → 0.0.55

package/dist/index.d.ts

@@ -6,7 +6,7 @@ import { ReactElement } from 'react';
 import { Matrix } from 'transformation-matrix';
 import { SchSymbol, BaseSymbolName } from 'schematic-symbols';
 import * as Props from '@tscircuit/props';
-import { traceProps, groupProps, boardProps, footprintProps, smtPadProps, resistorProps, ledProps, diodeProps, capacitorProps, traceHintProps, chipProps, jumperProps, silkscreenPathProps, platedHoleProps, constraintProps, holeProps, silkscreenTextProps, pcbKeepoutProps } from '@tscircuit/props';
+import { traceProps, groupProps, boardProps, footprintProps, smtPadProps, resistorProps, ledProps, diodeProps, capacitorProps, traceHintProps, chipProps, jumperProps, silkscreenPathProps, platedHoleProps, constraintProps, holeProps, silkscreenTextProps, pcbKeepoutProps, fabricationNoteTextProps, fabricationNotePathProps } from '@tscircuit/props';
 
 declare class Circuit {
     firstChild: PrimitiveComponent | null;
@@ -244,7 +244,7 @@ declare const netProps: z.ZodObject<{
 declare class Net extends PrimitiveComponent<typeof netProps> {
     source_net_id?: string;
     getPortSelector(): string;
-    doInitialSourceComponentRender(): void;
+    doInitialSourceRender(): void;
     /**
      * Get all ports connected to this net.
      *
@@ -4106,6 +4106,86 @@ declare class Keepout extends PrimitiveComponent<typeof pcbKeepoutProps> {
     doInitialPcbPrimitiveRender(): void;
 }
 
+declare class FabricationNoteText extends PrimitiveComponent<typeof fabricationNoteTextProps> {
+    doInitialPcbPrimitiveRender(): void;
+}
+
+declare class FabricationNotePath extends PrimitiveComponent<typeof fabricationNotePathProps> {
+    fabrication_note_path_id: string | null;
+    get config(): {
+        zodProps: zod.ZodObject<zod.objectUtil.extendShape<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>>;
+            layer: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, zod.ZodObject<{
+                name: zod.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
+            }, "strip", zod.ZodTypeAny, {
+                name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+            }, {
+                name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+            }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+                name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+            }>>;
+        }, "pcbRotation" | "pcbX" | "pcbY">, {
+            route: zod.ZodArray<zod.ZodObject<{
+                x: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
+                y: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
+                via: zod.ZodOptional<zod.ZodBoolean>;
+                to_layer: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, zod.ZodObject<{
+                    name: zod.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
+                }, "strip", zod.ZodTypeAny, {
+                    name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+                }, {
+                    name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+                }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+                    name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+                }>>;
+                trace_width: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+            }, "strip", zod.ZodTypeAny, {
+                x: number;
+                y: number;
+                trace_width?: number | undefined;
+                via?: boolean | undefined;
+                to_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
+            }, {
+                x: string | number;
+                y: string | number;
+                trace_width?: string | number | undefined;
+                via?: boolean | undefined;
+                to_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+                    name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+                } | undefined;
+            }>, "many">;
+            strokeWidth: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+        }>, "strip", zod.ZodTypeAny, {
+            route: {
+                x: number;
+                y: number;
+                trace_width?: number | undefined;
+                via?: boolean | undefined;
+                to_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
+            }[];
+            layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
+            strokeWidth?: number | undefined;
+        }, {
+            route: {
+                x: string | number;
+                y: string | number;
+                trace_width?: string | number | undefined;
+                via?: boolean | undefined;
+                to_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+                    name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+                } | undefined;
+            }[];
+            layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+                name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+            } | undefined;
+            strokeWidth?: string | number | undefined;
+        }>;
+    };
+    doInitialPcbPrimitiveRender(): void;
+}
+
 declare global {
     namespace JSX {
         interface IntrinsicElements {
@@ -4152,4 +4232,4 @@ declare global {
     }
 }
 
-export { Board, Capacitor, Chip, Circuit, Constraint, Diode, Footprint, Group, Hole, type IRenderable, Jumper, Keepout, Led, Net, NormalComponent, PlatedHole, Port, PrimitiveComponent, Project, Renderable, Resistor, SilkscreenPath, SilkscreenText, SmtPad, Trace, TraceHint };
+export { Board, Capacitor, Chip, Circuit, Constraint, Diode, FabricationNotePath, FabricationNoteText, Footprint, Group, Hole, type IRenderable, Jumper, Keepout, Led, Net, NormalComponent, PlatedHole, Port, PrimitiveComponent, Project, Renderable, Resistor, SilkscreenPath, SilkscreenText, SmtPad, Trace, TraceHint };

package/dist/index.js

@@ -12,6 +12,8 @@ __export(components_exports, {
   Chip: () => Chip,
   Constraint: () => Constraint2,
   Diode: () => Diode,
+  FabricationNotePath: () => FabricationNotePath,
+  FabricationNoteText: () => FabricationNoteText,
   Footprint: () => Footprint,
   Group: () => Group,
   Hole: () => Hole,
@@ -1489,7 +1491,7 @@ var Net = class extends PrimitiveComponent {
   getPortSelector() {
     return `net.${this.props.name}`;
   }
-  doInitialSourceComponentRender() {
+  doInitialSourceRender() {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const net = db.source_net.insert({
@@ -2074,8 +2076,7 @@ import "zod";
 import { traceProps } from "@tscircuit/props";
 import {
   IJumpAutorouter,
-  getObstaclesFromSoup,
-  markObstaclesAsConnected
+  getObstaclesFromSoup
 } from "@tscircuit/infgrid-ijump-astar";
 
 // lib/utils/autorouting/computeObstacleBounds.ts
@@ -2234,6 +2235,7 @@ function tryNow(fn) {
 }
 
 // lib/components/primitive-components/Trace.ts
+import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map";
 var portToObjective = (port) => {
   const portPosition = port._getGlobalPcbPositionAfterLayout();
   return {
@@ -2458,14 +2460,17 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       );
       return;
     }
-    const [obstacles, err] = tryNow(
+    const connMap = getFullConnectivityMapFromCircuitJson(
+      this.root.db.toArray()
+    );
+    const [obstacles, errGettingObstacles] = tryNow(
       () => getObstaclesFromSoup(this.root.db.toArray())
     );
-    if (err) {
+    if (errGettingObstacles) {
       this.renderError({
         type: "pcb_error",
         error_type: "pcb_trace_error",
-        message: `Error getting obstacles for autorouting: ${err.message}`,
+        message: `Error getting obstacles for autorouting: ${errGettingObstacles.message}`,
         source_trace_id: this.source_trace_id,
         center: { x: 0, y: 0 },
         pcb_port_ids: ports.map((p) => p.pcb_port_id),
@@ -2474,19 +2479,13 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       });
       return;
     }
-    markObstaclesAsConnected(
-      obstacles,
-      orderedRouteObjectives,
-      this.source_trace_id
-    );
-    const allConnectedTraceIds = this._getAllTracesConnectedToSameNet().map(
-      (t) => t.source_trace_id
-    );
     for (const obstacle of obstacles) {
-      if (obstacle.connectedTo.some(
-        (connection) => allConnectedTraceIds.includes(connection)
-      )) {
-        obstacle.connectedTo.push(this.source_trace_id);
+      const connectedTo = obstacle.connectedTo;
+      if (connectedTo.length > 0) {
+        const netId = connMap.getNetConnectedToId(obstacle.connectedTo[0]);
+        if (netId) {
+          obstacle.connectedTo.push(netId);
+        }
       }
     }
     const candidateLayerSelections = candidateLayerCombinations[0].layer_path;
@@ -2509,7 +2508,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
           obstacles,
           connections: [
             {
-              name: this.source_trace_id,
+              name: connMap.getNetConnectedToId(this.source_trace_id),
               pointsToConnect: [
                 { ...a, layer: dominantLayer ?? "top" },
                 { ...b, layer: dominantLayer ?? "top" }
@@ -3369,6 +3368,69 @@ var SilkscreenText = class extends PrimitiveComponent {
   }
 };
 
+// lib/components/primitive-components/FabricationNoteText.ts
+import "@tscircuit/props";
+var FabricationNoteText = class extends PrimitiveComponent {
+  doInitialPcbPrimitiveRender() {
+    const { db } = this.root;
+    const { _parsedProps: props } = this;
+    const container = this.getPrimitiveContainer();
+    db.pcb_fabrication_note_text.insert({
+      anchor_alignment: props.anchorAlignment,
+      anchor_position: {
+        x: props.pcbX ?? 0,
+        y: props.pcbY ?? 0
+      },
+      font: props.font ?? "tscircuit2024",
+      font_size: props.fontSize ?? 1,
+      layer: "top",
+      text: props.text ?? "",
+      pcb_component_id: container.pcb_component_id
+    });
+  }
+};
+
+// lib/components/primitive-components/FabricationNotePath.ts
+import { fabricationNotePathProps } from "@tscircuit/props";
+import { applyToPoint as applyToPoint5 } from "transformation-matrix";
+var FabricationNotePath = class extends PrimitiveComponent {
+  fabrication_note_path_id = null;
+  get config() {
+    return {
+      zodProps: fabricationNotePathProps
+    };
+  }
+  doInitialPcbPrimitiveRender() {
+    const { db } = this.root;
+    const { _parsedProps: props } = this;
+    const layer = props.layer ?? "top";
+    if (layer !== "top" && layer !== "bottom") {
+      throw new Error(
+        `Invalid layer "${layer}" for SilkscreenPath. Must be "top" or "bottom".`
+      );
+    }
+    const transform = this._computePcbGlobalTransformBeforeLayout();
+    const fabrication_note_path = db.pcb_fabrication_note_path.insert({
+      pcb_component_id: this.parent?.pcb_component_id,
+      layer,
+      route: props.route.map((p) => {
+        const transformedPosition = applyToPoint5(transform, {
+          x: p.x,
+          y: p.y
+        });
+        return {
+          ...p,
+          x: transformedPosition.x,
+          y: transformedPosition.y
+        };
+      }),
+      stroke_width: props.strokeWidth ?? 0.1,
+      fabrication_note_path_id: `fabrication_note_${Math.random().toString()}`
+    });
+    this.fabrication_note_path_id = fabrication_note_path.fabrication_note_path_id;
+  }
+};
+
 // lib/Project.ts
 import { su } from "@tscircuit/soup-util";
 import { isValidElement as isValidElement2 } from "react";
@@ -3474,6 +3536,8 @@ export {
   Circuit,
   Constraint2 as Constraint,
   Diode,
+  FabricationNotePath,
+  FabricationNoteText,
   Footprint,
   Group,
   Hole,

package/lib/components/index.ts

@@ -21,3 +21,5 @@ export { Constraint } from "./primitive-components/Constraint"
 export { Hole } from "./primitive-components/Hole"
 export { SilkscreenText } from "./primitive-components/SilkscreenText"
 export { Keepout } from "./primitive-components/Keepout"
+export { FabricationNoteText } from "./primitive-components/FabricationNoteText"
+export { FabricationNotePath } from "./primitive-components/FabricationNotePath"

package/lib/components/primitive-components/FabricationNotePath.ts

@@ -0,0 +1,50 @@
+import { fabricationNotePathProps } from "@tscircuit/props"
+import { PrimitiveComponent } from "../base-components/PrimitiveComponent"
+import { applyToPoint } from "transformation-matrix"
+
+export class FabricationNotePath extends PrimitiveComponent<
+  typeof fabricationNotePathProps
+> {
+  fabrication_note_path_id: string | null = null
+
+  get config() {
+    return {
+      zodProps: fabricationNotePathProps,
+    }
+  }
+
+  doInitialPcbPrimitiveRender(): void {
+    const { db } = this.root!
+    const { _parsedProps: props } = this
+
+    const layer = props.layer ?? "top"
+    if (layer !== "top" && layer !== "bottom") {
+      throw new Error(
+        `Invalid layer "${layer}" for SilkscreenPath. Must be "top" or "bottom".`,
+      )
+    }
+
+    const transform = this._computePcbGlobalTransformBeforeLayout()
+
+    const fabrication_note_path = db.pcb_fabrication_note_path.insert({
+      pcb_component_id: this.parent?.pcb_component_id!,
+      layer,
+      route: props.route.map((p) => {
+        const transformedPosition = applyToPoint(transform, {
+          x: p.x,
+          y: p.y,
+        })
+        return {
+          ...p,
+          x: transformedPosition.x,
+          y: transformedPosition.y,
+        }
+      }),
+      stroke_width: props.strokeWidth ?? 0.1,
+      fabrication_note_path_id: `fabrication_note_${Math.random().toString()}`,
+    })
+
+    this.fabrication_note_path_id =
+      fabrication_note_path.fabrication_note_path_id
+  }
+}

package/lib/components/primitive-components/FabricationNoteText.ts

@@ -0,0 +1,25 @@
+import { PrimitiveComponent } from "../base-components/PrimitiveComponent"
+import { fabricationNoteTextProps } from "@tscircuit/props"
+
+export class FabricationNoteText extends PrimitiveComponent<
+  typeof fabricationNoteTextProps
+> {
+  doInitialPcbPrimitiveRender(): void {
+    const { db } = this.root!
+    const { _parsedProps: props } = this
+    const container = this.getPrimitiveContainer()!
+
+    db.pcb_fabrication_note_text.insert({
+      anchor_alignment: props.anchorAlignment,
+      anchor_position: {
+        x: props.pcbX ?? 0,
+        y: props.pcbY ?? 0,
+      },
+      font: props.font ?? "tscircuit2024",
+      font_size: props.fontSize ?? 1,
+      layer: "top",
+      text: props.text ?? "",
+      pcb_component_id: container.pcb_component_id!,
+    })
+  }
+}

package/lib/components/primitive-components/Net.ts

@@ -17,7 +17,7 @@ export class Net extends PrimitiveComponent<typeof netProps> {
     return `net.${this.props.name}`
   }
 
-  doInitialSourceComponentRender(): void {
+  doInitialSourceRender(): void {
     const { db } = this.root!
     const { _parsedProps: props } = this
 

package/lib/components/primitive-components/Trace.ts

@@ -39,6 +39,7 @@ import {
   isMatchingSelector,
 } from "lib/utils/selector-matching"
 import { tryNow } from "lib/utils/try-now"
+import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map"
 
 type PcbRouteObjective =
   | RouteHintPoint
@@ -356,17 +357,21 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       return
     }
 
+    const connMap = getFullConnectivityMapFromCircuitJson(
+      this.root!.db.toArray(),
+    )
+
     // Cache the PCB obstacles, they'll be needed for each segment between
     // ports/hints
-    const [obstacles, err] = tryNow(() =>
+    const [obstacles, errGettingObstacles] = tryNow(() =>
       getObstaclesFromSoup(this.root!.db.toArray()),
     )
 
-    if (err) {
+    if (errGettingObstacles) {
       this.renderError({
         type: "pcb_error",
         error_type: "pcb_trace_error",
-        message: `Error getting obstacles for autorouting: ${err.message}`,
+        message: `Error getting obstacles for autorouting: ${errGettingObstacles.message}`,
         source_trace_id: this.source_trace_id!,
         center: { x: 0, y: 0 },
         pcb_port_ids: ports.map((p) => p.pcb_port_id!),
@@ -376,22 +381,13 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       return
     }
 
-    markObstaclesAsConnected(
-      obstacles,
-      orderedRouteObjectives,
-      this.source_trace_id!,
-    )
-
-    const allConnectedTraceIds = this._getAllTracesConnectedToSameNet().map(
-      (t) => t.source_trace_id,
-    )
     for (const obstacle of obstacles) {
-      if (
-        obstacle.connectedTo.some((connection) =>
-          allConnectedTraceIds.includes(connection),
-        )
-      ) {
-        obstacle.connectedTo.push(this.source_trace_id!)
+      const connectedTo = obstacle.connectedTo
+      if (connectedTo.length > 0) {
+        const netId = connMap.getNetConnectedToId(obstacle.connectedTo[0])
+        if (netId) {
+          obstacle.connectedTo.push(netId)
+        }
       }
     }
 
@@ -424,7 +420,7 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
           obstacles,
           connections: [
             {
-              name: this.source_trace_id!,
+              name: connMap.getNetConnectedToId(this.source_trace_id!)!,
               pointsToConnect: [
                 { ...a, layer: dominantLayer ?? "top" },
                 { ...b, layer: dominantLayer ?? "top" },

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/core",
   "module": "index.ts",
   "type": "module",
-  "version": "0.0.53",
+  "version": "0.0.55",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "files": [
@@ -34,10 +34,11 @@
   },
   "dependencies": {
     "@lume/kiwi": "^0.4.3",
-    "@tscircuit/infgrid-ijump-astar": "^0.0.12",
+    "@tscircuit/infgrid-ijump-astar": "^0.0.13",
     "@tscircuit/props": "^0.0.62",
     "@tscircuit/soup": "^0.0.67",
     "@tscircuit/soup-util": "^0.0.23",
+    "circuit-json-to-connectivity-map": "^0.0.8",
     "footprinter": "^0.0.44",
     "react": "^18.3.1",
     "react-reconciler": "^0.29.2",