@tscircuit/core 0.0.41 → 0.0.43

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", "PcbParentAttachment", "PcbLayout", "PcbTraceRender", "PcbRouteNetIslands", "PcbComponentSizeCalculation", "CadModelRender"];
+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"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
 type RenderPhaseFn<K extends RenderPhase = RenderPhase> = `doInitial${K}` | `update${K}` | `remove${K}`;
 type RenderPhaseStates = Record<RenderPhase, {
@@ -788,6 +788,7 @@ declare class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
     };
     doInitialPortMatching(): void;
     doInitialPcbPrimitiveRender(): void;
+    doInitialPcbPortAttachment(): void;
     _getPcbCircuitJsonBounds(): {
         center: {
             x: number;
@@ -3857,6 +3858,7 @@ declare class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
     }): void;
     doInitialPortMatching(): void;
     doInitialPcbPrimitiveRender(): void;
+    doInitialPcbPortAttachment(): void;
 }
 
 declare const edgeSpecifiers: readonly ["leftedge", "rightedge", "topedge", "bottomedge", "center"];

package/dist/index.js

@@ -56,7 +56,7 @@ var orderedRenderPhases = [
   "PcbPrimitiveRender",
   "PcbFootprintLayout",
   "PcbPortRender",
-  "PcbParentAttachment",
+  "PcbPortAttachment",
   "PcbLayout",
   "PcbTraceRender",
   "PcbRouteNetIslands",
@@ -134,7 +134,7 @@ import {
   translate
 } from "transformation-matrix";
 
-// lib/utils/selector-matching/index.ts
+// lib/utils/selector-matching/is-matching-selector.ts
 function isMatchingSelector(component, selector) {
   const idMatch = selector.match(/^#(\w+)/);
   if (idMatch) {
@@ -163,6 +163,20 @@ 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;
@@ -1128,6 +1142,7 @@ var SmtPad = class extends PrimitiveComponent {
       pcb_smtpad = db.pcb_smtpad.insert({
         pcb_component_id: this.parent?.pcb_component_id,
         pcb_port_id: this.matchedPort?.pcb_port_id,
+        // port likely isn't matched
         layer: props.layer ?? "top",
         shape: "circle",
         // @ts-ignore: no idea why this is triggering
@@ -1140,6 +1155,7 @@ var SmtPad = class extends PrimitiveComponent {
       pcb_smtpad = db.pcb_smtpad.insert({
         pcb_component_id: this.parent?.pcb_component_id,
         pcb_port_id: this.matchedPort?.pcb_port_id,
+        // port likely isn't matched
         layer: props.layer ?? "top",
         shape: "rect",
         ...isRotated90 ? { width: props.height, height: props.width } : { width: props.width, height: props.height },
@@ -1152,6 +1168,12 @@ var SmtPad = class extends PrimitiveComponent {
       this.pcb_smtpad_id = pcb_smtpad.pcb_smtpad_id;
     }
   }
+  doInitialPcbPortAttachment() {
+    const { db } = this.root;
+    db.pcb_smtpad.update(this.pcb_smtpad_id, {
+      pcb_port_id: this.matchedPort?.pcb_port_id
+    });
+  }
   _getPcbCircuitJsonBounds() {
     const { db } = this.root;
     const smtpad = db.pcb_smtpad.get(this.pcb_smtpad_id);
@@ -1317,6 +1339,12 @@ var PlatedHole = class extends PrimitiveComponent {
       this.pcb_plated_hole_id = pcb_plated_hole.pcb_plated_hole_id;
     }
   }
+  doInitialPcbPortAttachment() {
+    const { db } = this.root;
+    db.pcb_plated_hole.update(this.pcb_plated_hole_id, {
+      pcb_port_id: this.matchedPort?.pcb_port_id
+    });
+  }
 };
 
 // lib/utils/createComponentsFromSoup.ts
@@ -2238,8 +2266,13 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     const hints = ports.flatMap(
       (port) => port.matchedComponents.filter((c) => c.componentName === "TraceHint")
     );
-    const pcbRouteHints = (this._parsedProps.pcbRouteHints ?? []).concat(
-      hints.flatMap((h) => h.getPcbRouteHints())
+    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)
     );
     if (ports.length > 2) {
       this.renderError(

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

@@ -19,7 +19,7 @@ export const orderedRenderPhases = [
   "PcbPrimitiveRender",
   "PcbFootprintLayout",
   "PcbPortRender",
-  "PcbParentAttachment",
+  "PcbPortAttachment",
   "PcbLayout",
   "PcbTraceRender",
   "PcbRouteNetIslands",

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

@@ -98,4 +98,11 @@ export class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
       this.pcb_plated_hole_id = pcb_plated_hole.pcb_plated_hole_id
     }
   }
+
+  doInitialPcbPortAttachment(): void {
+    const { db } = this.root!
+    db.pcb_plated_hole.update(this.pcb_plated_hole_id!, {
+      pcb_port_id: this.matchedPort?.pcb_port_id!,
+    })
+  }
 }

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

@@ -63,7 +63,7 @@ export class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
     if (props.shape === "circle") {
       pcb_smtpad = db.pcb_smtpad.insert({
         pcb_component_id: this.parent?.pcb_component_id!,
-        pcb_port_id: this.matchedPort?.pcb_port_id!,
+        pcb_port_id: this.matchedPort?.pcb_port_id!, // port likely isn't matched
         layer: props.layer ?? "top",
         shape: "circle",
 
@@ -78,7 +78,7 @@ export class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
     } else if (props.shape === "rect") {
       pcb_smtpad = db.pcb_smtpad.insert({
         pcb_component_id: this.parent?.pcb_component_id!,
-        pcb_port_id: this.matchedPort?.pcb_port_id!,
+        pcb_port_id: this.matchedPort?.pcb_port_id!, // port likely isn't matched
         layer: props.layer ?? "top",
         shape: "rect",
 
@@ -97,6 +97,13 @@ export class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
     }
   }
 
+  doInitialPcbPortAttachment(): void {
+    const { db } = this.root!
+    db.pcb_smtpad.update(this.pcb_smtpad_id!, {
+      pcb_port_id: this.matchedPort?.pcb_port_id!,
+    })
+  }
+
   _getPcbCircuitJsonBounds(): {
     center: { x: number; y: number }
     bounds: { left: number; top: number; right: number; bottom: number }

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

@@ -32,6 +32,10 @@ import type { Net } from "./Net"
 import { getClosest } from "lib/utils/getClosest"
 import { z } from "zod"
 import { createNetsFromProps } from "lib/utils/components/createNetsFromProps"
+import {
+  isMatchingPathSelector,
+  isMatchingSelector,
+} from "lib/utils/selector-matching"
 
 type PcbRouteObjective =
   | RouteHintPoint
@@ -299,9 +303,20 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       port.matchedComponents.filter((c) => c.componentName === "TraceHint"),
     ) as TraceHint[]
 
-    const pcbRouteHints = (this._parsedProps.pcbRouteHints ?? []).concat(
-      hints.flatMap((h) => h.getPcbRouteHints()),
-    )
+    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),
+      )
 
     if (ports.length > 2) {
       this.renderError(

package/lib/utils/selector-matching/index.ts

@@ -1,64 +1,2 @@
-import type { PrimitiveComponent } from "lib/components"
-import type { Primitive } from "schematic-symbols/drawing/types"
-
-/**
- * Determines if a component matches a given selector.
- *
- * This function supports the following selector types:
- * - ID selectors (#id)
- * - Class selectors (.className)
- * - Type selectors (resistor)
- * - Attribute selectors ([key='value'])
- *
- * It also supports combinations of these selectors.
- *
- * @param component - The component to check.
- * @param selector - The selector string to match against.
- * @returns True if the component matches the selector, false otherwise.
- */
-export function isMatchingSelector(
-  component: PrimitiveComponent,
-  selector: string,
-): boolean {
-  // Check for ID selector
-  const idMatch = selector.match(/^#(\w+)/)
-  if (idMatch) {
-    return component.props.id === idMatch[1]
-  }
-
-  // Check for class selector
-  const classMatch = selector.match(/^\.(\w+)/)
-  if (classMatch) {
-    return component.isMatchingNameOrAlias(classMatch[1])
-  }
-
-  // Split the selector into type and conditions
-  let [type, ...conditions] = selector.split(/(?=[#.[])/)
-
-  if (type === "pin") type = "port"
-
-  // Check if the component type matches
-  if (
-    type &&
-    type !== "*" &&
-    component.lowercaseComponentName !== type.toLowerCase()
-  ) {
-    return false
-  }
-
-  // Check all conditions
-  return conditions.every((condition) => {
-    if (condition.startsWith("#")) {
-      return component.props.id === condition.slice(1)
-    }
-    if (condition.startsWith(".")) {
-      return component.isMatchingNameOrAlias(condition.slice(1))
-    }
-
-    // Check for attribute selector
-    const match = condition.match(/\[(\w+)=['"]?(.+?)['"]?\]/)
-    if (!match) return true
-    const [, prop, value] = match
-    return component.props[prop].toString() === value
-  })
-}
+export * from "./is-matching-selector"
+export * from "./is-matching-path-selector"

package/lib/utils/selector-matching/is-matching-path-selector.ts

@@ -0,0 +1,32 @@
+import type { PrimitiveComponent } from "lib/components"
+import type { Primitive } from "schematic-symbols/drawing/types"
+
+import { isMatchingSelector } from "./is-matching-selector"
+
+/**
+ * Determines if a component matches a path selector, meaning that the last
+ * selector matches the current component, and the previous selectors match
+ * the parent components.
+ */
+export function isMatchingPathSelector(
+  component: PrimitiveComponent,
+  selector: string,
+): boolean {
+  const selectorParts = selector.split(/\> /g).map((part) => part.trim())
+  let currentComponent: PrimitiveComponent | null = component
+
+  // Iterate through selector parts from right to left
+  for (let i = selectorParts.length - 1; i >= 0; i--) {
+    if (!currentComponent) return false
+
+    if (!isMatchingSelector(currentComponent, selectorParts[i])) {
+      return false
+    }
+
+    // Move to the parent component for the next iteration
+    currentComponent = currentComponent.parent
+  }
+
+  // If we've matched all parts of the selector, it's a match
+  return true
+}

package/lib/utils/selector-matching/is-matching-selector.ts

@@ -0,0 +1,64 @@
+import type { PrimitiveComponent } from "lib/components"
+import type { Primitive } from "schematic-symbols/drawing/types"
+
+/**
+ * Determines if a component matches a given selector.
+ *
+ * This function supports the following selector types:
+ * - ID selectors (#id)
+ * - Class selectors (.className)
+ * - Type selectors (resistor)
+ * - Attribute selectors ([key='value'])
+ *
+ * It also supports combinations of these selectors.
+ *
+ * @param component - The component to check.
+ * @param selector - The selector string to match against.
+ * @returns True if the component matches the selector, false otherwise.
+ */
+export function isMatchingSelector(
+  component: PrimitiveComponent,
+  selector: string,
+): boolean {
+  // Check for ID selector
+  const idMatch = selector.match(/^#(\w+)/)
+  if (idMatch) {
+    return component.props.id === idMatch[1]
+  }
+
+  // Check for class selector
+  const classMatch = selector.match(/^\.(\w+)/)
+  if (classMatch) {
+    return component.isMatchingNameOrAlias(classMatch[1])
+  }
+
+  // Split the selector into type and conditions
+  let [type, ...conditions] = selector.split(/(?=[#.[])/)
+
+  if (type === "pin") type = "port"
+
+  // Check if the component type matches
+  if (
+    type &&
+    type !== "*" &&
+    component.lowercaseComponentName !== type.toLowerCase()
+  ) {
+    return false
+  }
+
+  // Check all conditions
+  return conditions.every((condition) => {
+    if (condition.startsWith("#")) {
+      return component.props.id === condition.slice(1)
+    }
+    if (condition.startsWith(".")) {
+      return component.isMatchingNameOrAlias(condition.slice(1))
+    }
+
+    // Check for attribute selector
+    const match = condition.match(/\[(\w+)=['"]?(.+?)['"]?\]/)
+    if (!match) return true
+    const [, prop, value] = match
+    return component.props[prop].toString() === value
+  })
+}

package/package.json

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