@tscircuit/core 0.0.46 → 0.0.47

package/dist/index.d.ts

@@ -41,7 +41,7 @@ declare class Circuit {
  */
 declare const Project: typeof Circuit;
 
-declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "InitializePortsFromChildren", "CreateNetsFromProps", "CreateTracesFromProps", "SourceRender", "SourceParentAttachment", "PortDiscovery", "PortMatching", "SourceTraceRender", "SchematicComponentRender", "SchematicLayout", "SchematicPortRender", "SchematicTraceRender", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbLayout", "PcbTraceRender", "PcbRouteNetIslands", "PcbComponentSizeCalculation", "CadModelRender"];
+declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "InitializePortsFromChildren", "CreateNetsFromProps", "CreateTracesFromProps", "CreateTraceHintsFromProps", "SourceRender", "SourceParentAttachment", "PortDiscovery", "PortMatching", "SourceTraceRender", "SchematicComponentRender", "SchematicLayout", "SchematicPortRender", "SchematicTraceRender", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbLayout", "PcbTraceRender", "PcbTraceHintRender", "PcbRouteNetIslands", "PcbComponentSizeCalculation", "CadModelRender"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
 type RenderPhaseFn<K extends RenderPhase = RenderPhase> = `doInitial${K}` | `update${K}` | `remove${K}`;
 type RenderPhaseStates = Record<RenderPhase, {
@@ -643,6 +643,7 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     get config(): {
         zodProps: Props;
     };
+    doInitialCreateTraceHintsFromProps(): void;
 }
 
 declare class Board extends Group<typeof boardProps> {
@@ -2448,6 +2449,7 @@ declare class TraceHint extends PrimitiveComponent<typeof traceHintProps> {
     matchedPort: Port | null;
     doInitialPortMatching(): void;
     getPcbRouteHints(): Array<RouteHintPoint>;
+    doInitialPcbTraceHintRender(): void;
 }
 
 interface SchematicBoxDimensions {

package/dist/index.js

@@ -44,6 +44,7 @@ var orderedRenderPhases = [
   "InitializePortsFromChildren",
   "CreateNetsFromProps",
   "CreateTracesFromProps",
+  "CreateTraceHintsFromProps",
   "SourceRender",
   "SourceParentAttachment",
   "PortDiscovery",
@@ -60,6 +61,7 @@ var orderedRenderPhases = [
   "PcbPortAttachment",
   "PcbLayout",
   "PcbTraceRender",
+  "PcbTraceHintRender",
   "PcbRouteNetIslands",
   "PcbComponentSizeCalculation",
   "CadModelRender"
@@ -164,20 +166,6 @@ function isMatchingSelector(component, selector) {
   });
 }
 
-// lib/utils/selector-matching/is-matching-path-selector.ts
-function isMatchingPathSelector(component, selector) {
-  const selectorParts = selector.split(/\> /g).map((part) => part.trim());
-  let currentComponent = component;
-  for (let i = selectorParts.length - 1; i >= 0; i--) {
-    if (!currentComponent) return false;
-    if (!isMatchingSelector(currentComponent, selectorParts[i])) {
-      return false;
-    }
-    currentComponent = currentComponent.parent;
-  }
-  return true;
-}
-
 // lib/components/base-components/PrimitiveComponent.ts
 var PrimitiveComponent = class extends Renderable {
   parent = null;
@@ -1948,15 +1936,89 @@ import { boardProps } from "@tscircuit/props";
 import { identity as identity4 } from "transformation-matrix";
 
 // lib/components/primitive-components/Group.ts
-import { groupProps } from "@tscircuit/props";
+import {
+  groupProps
+} from "@tscircuit/props";
 import "transformation-matrix";
 import "zod";
+
+// lib/components/primitive-components/TraceHint.ts
+import "@tscircuit/props";
+import { applyToPoint as applyToPoint4 } from "transformation-matrix";
+var TraceHint = class extends PrimitiveComponent {
+  matchedPort = null;
+  doInitialPortMatching() {
+    const { db } = this.root;
+    const { _parsedProps: props, parent } = this;
+    if (!parent) return;
+    if (parent.componentName === "Trace") {
+      this.renderError(
+        `Port inference inside trace is not yet supported (${this})`
+      );
+      return;
+    }
+    if (!parent) throw new Error("TraceHint has no parent");
+    if (!props.for) {
+      this.renderError(`TraceHint has no for property (${this})`);
+      return;
+    }
+    const port = parent.selectOne(props.for, { type: "port" });
+    if (!port) {
+      this.renderError(
+        `${this} could not find port for selector "${props.for}"`
+      );
+    }
+    this.matchedPort = port;
+    port.registerMatch(this);
+  }
+  getPcbRouteHints() {
+    const { _parsedProps: props } = this;
+    const offsets = props.offset ? [props.offset] : props.offsets;
+    if (!offsets) return [];
+    const globalTransform = this._computePcbGlobalTransformBeforeLayout();
+    return offsets.map(
+      (offset) => ({
+        ...applyToPoint4(globalTransform, offset),
+        via: offset.via,
+        to_layer: offset.to_layer,
+        trace_width: offset.trace_width
+      })
+    );
+  }
+  doInitialPcbTraceHintRender() {
+    const { db } = this.root;
+    const { _parsedProps: props } = this;
+    db.pcb_trace_hint.insert({
+      pcb_component_id: this.matchedPort?.pcb_component_id,
+      pcb_port_id: this.matchedPort?.pcb_port_id,
+      route: this.getPcbRouteHints()
+    });
+  }
+};
+
+// lib/components/primitive-components/Group.ts
 var Group = class extends NormalComponent {
   get config() {
     return {
       zodProps: groupProps
     };
   }
+  doInitialCreateTraceHintsFromProps() {
+    const { _parsedProps: props } = this;
+    const { db } = this.root;
+    const groupProps2 = props;
+    if (!this.isSubcircuit) return;
+    const manualTraceHints = groupProps2.layout?.manual_trace_hints;
+    if (!manualTraceHints) return;
+    for (const manualTraceHint of manualTraceHints) {
+      this.add(
+        new TraceHint({
+          for: manualTraceHint.pcb_port_selector,
+          offsets: manualTraceHint.offsets
+        })
+      );
+    }
+  }
 };
 
 // lib/components/normal-components/Board.ts
@@ -2335,13 +2397,8 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     const hints = ports.flatMap(
       (port) => port.matchedComponents.filter((c) => c.componentName === "TraceHint")
     );
-    const manualTraceHints = this.getSubcircuit().props.layout?.manual_trace_hints ?? [];
-    const pcbRouteHints = (this._parsedProps.pcbRouteHints ?? []).concat(hints.flatMap((h) => h.getPcbRouteHints())).concat(
-      manualTraceHints.filter(
-        (hint) => ports.some(
-          (port) => isMatchingPathSelector(port, hint.pcb_port_selector)
-        )
-      ).flatMap((hint) => hint.offsets)
+    const pcbRouteHints = (this._parsedProps.pcbRouteHints ?? []).concat(
+      hints.flatMap((h) => h.getPcbRouteHints())
     );
     if (ports.length > 2) {
       this.renderError(
@@ -2653,51 +2710,6 @@ var Capacitor = class extends NormalComponent {
   }
 };
 
-// lib/components/primitive-components/TraceHint.ts
-import "@tscircuit/props";
-import { applyToPoint as applyToPoint4 } from "transformation-matrix";
-var TraceHint = class extends PrimitiveComponent {
-  matchedPort = null;
-  doInitialPortMatching() {
-    const { db } = this.root;
-    const { _parsedProps: props, parent } = this;
-    if (!parent) return;
-    if (parent.componentName === "Trace") {
-      this.renderError(
-        `Port inference inside trace is not yet supported (${this})`
-      );
-      return;
-    }
-    if (!parent) throw new Error("TraceHint has no parent");
-    if (!props.for) {
-      this.renderError(`TraceHint has no for property (${this})`);
-      return;
-    }
-    const port = parent.selectOne(props.for, { type: "port" });
-    if (!port) {
-      this.renderError(
-        `${this} could not find port for selector "${props.for}"`
-      );
-    }
-    this.matchedPort = port;
-    port.registerMatch(this);
-  }
-  getPcbRouteHints() {
-    const { _parsedProps: props } = this;
-    const offsets = props.offset ? [props.offset] : props.offsets;
-    if (!offsets) return [];
-    const globalTransform = this._computePcbGlobalTransformBeforeLayout();
-    return offsets.map(
-      (offset) => ({
-        ...applyToPoint4(globalTransform, offset),
-        via: offset.via,
-        to_layer: offset.to_layer,
-        trace_width: offset.trace_width
-      })
-    );
-  }
-};
-
 // lib/components/normal-components/Chip.ts
 import { chipProps } from "@tscircuit/props";
 

package/lib/components/base-components/Renderable.ts

@@ -6,6 +6,7 @@ export const orderedRenderPhases = [
   "InitializePortsFromChildren",
   "CreateNetsFromProps",
   "CreateTracesFromProps",
+  "CreateTraceHintsFromProps",
   "SourceRender",
   "SourceParentAttachment",
   "PortDiscovery",
@@ -22,6 +23,7 @@ export const orderedRenderPhases = [
   "PcbPortAttachment",
   "PcbLayout",
   "PcbTraceRender",
+  "PcbTraceHintRender",
   "PcbRouteNetIslands",
   "PcbComponentSizeCalculation",
   "CadModelRender",

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

@@ -1,8 +1,13 @@
-import { groupProps } from "@tscircuit/props"
+import {
+  groupProps,
+  type GroupProps,
+  type SubcircuitGroupProps,
+} from "@tscircuit/props"
 import { PrimitiveComponent } from "../base-components/PrimitiveComponent"
 import { compose, identity } from "transformation-matrix"
 import { z } from "zod"
 import { NormalComponent } from "../base-components/NormalComponent"
+import { TraceHint } from "./TraceHint"
 
 export class Group<
   Props extends z.ZodType<any, any, any> = typeof groupProps,
@@ -12,4 +17,26 @@ export class Group<
       zodProps: groupProps as unknown as Props,
     }
   }
+
+  doInitialCreateTraceHintsFromProps(): void {
+    const { _parsedProps: props } = this
+    const { db } = this.root!
+
+    const groupProps = props as SubcircuitGroupProps
+
+    if (!this.isSubcircuit) return
+
+    const manualTraceHints = groupProps.layout?.manual_trace_hints
+
+    if (!manualTraceHints) return
+
+    for (const manualTraceHint of manualTraceHints) {
+      this.add(
+        new TraceHint({
+          for: manualTraceHint.pcb_port_selector,
+          offsets: manualTraceHint.offsets,
+        }),
+      )
+    }
+  }
 }

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

@@ -304,20 +304,9 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       port.matchedComponents.filter((c) => c.componentName === "TraceHint"),
     ) as TraceHint[]
 
-    const manualTraceHints =
-      this.getSubcircuit().props.layout?.manual_trace_hints ?? []
-
-    const pcbRouteHints = (this._parsedProps.pcbRouteHints ?? [])
-      .concat(hints.flatMap((h) => h.getPcbRouteHints()))
-      .concat(
-        manualTraceHints
-          .filter((hint: { pcb_port_selector: string }) =>
-            ports.some((port) =>
-              isMatchingPathSelector(port, hint.pcb_port_selector),
-            ),
-          )
-          .flatMap((hint: { offsets: RouteHintPoint[] }) => hint.offsets),
-      )
+    const pcbRouteHints = (this._parsedProps.pcbRouteHints ?? []).concat(
+      hints.flatMap((h) => h.getPcbRouteHints()),
+    )
 
     if (ports.length > 2) {
       this.renderError(

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

@@ -57,4 +57,15 @@ export class TraceHint extends PrimitiveComponent<typeof traceHintProps> {
       }),
     )
   }
+
+  doInitialPcbTraceHintRender(): void {
+    const { db } = this.root!
+    const { _parsedProps: props } = this
+
+    db.pcb_trace_hint.insert({
+      pcb_component_id: this.matchedPort?.pcb_component_id!,
+      pcb_port_id: this.matchedPort?.pcb_port_id!,
+      route: this.getPcbRouteHints(),
+    })
+  }
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/core",
   "module": "index.ts",
   "type": "module",
-  "version": "0.0.46",
+  "version": "0.0.47",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "files": [