@tscircuit/core 0.0.122 → 0.0.124

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import { Matrix } from 'transformation-matrix';
 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 } from '@tscircuit/props';
 
-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"];
+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];
 type RenderPhaseFn<K extends RenderPhase = RenderPhase> = `doInitial${K}` | `update${K}` | `remove${K}`;
 type RenderPhaseStates = Record<RenderPhase, {
@@ -598,6 +598,10 @@ declare class Port extends PrimitiveComponent<typeof portProps> {
         x: number;
         y: number;
     };
+    _getGlobalSchematicPositionAfterLayout(): {
+        x: number;
+        y: number;
+    };
     /**
      * Smtpads and platedholes call this method to register themselves as a match
      * for this port. All the matching is done by primitives other than the Port,
@@ -720,6 +724,7 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
         componentName: string;
     };
     doInitialCreateTraceHintsFromProps(): void;
+    doInitialSchematicLayout(): void;
 }
 
 declare class Board extends Group<typeof boardProps> {
@@ -746,6 +751,7 @@ declare class Board extends Group<typeof boardProps> {
             routingDisabled: z.ZodOptional<z.ZodBoolean>;
             children: z.ZodAny;
             defaultTraceWidth: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
+            schAutoLayoutEnabled: z.ZodOptional<z.ZodBoolean>;
         }, "strip", z.ZodTypeAny, {
             pcbX: number;
             pcbY: number;
@@ -755,6 +761,7 @@ declare class Board extends Group<typeof boardProps> {
             layout?: any;
             routingDisabled?: boolean | undefined;
             defaultTraceWidth?: number | undefined;
+            schAutoLayoutEnabled?: boolean | undefined;
             outline?: {
                 x: number;
                 y: number;
@@ -768,6 +775,7 @@ declare class Board extends Group<typeof boardProps> {
             layout?: any;
             routingDisabled?: boolean | undefined;
             defaultTraceWidth?: string | number | undefined;
+            schAutoLayoutEnabled?: boolean | undefined;
             outline?: {
                 x: string | number;
                 y: string | number;

package/dist/index.js

@@ -60,8 +60,8 @@ var orderedRenderPhases = [
   "PortMatching",
   "SourceTraceRender",
   "SchematicComponentRender",
-  "SchematicLayout",
   "SchematicPortRender",
+  "SchematicLayout",
   "SchematicTraceRender",
   "PcbComponentRender",
   "PcbPrimitiveRender",
@@ -1530,6 +1530,20 @@ var Port = class extends PrimitiveComponent {
     );
     return applyToPoint4(transform, this.schematicSymbolPortDef);
   }
+  _getGlobalSchematicPositionAfterLayout() {
+    const { db } = this.root;
+    if (!this.schematic_port_id) {
+      throw new Error(
+        `Can't get schematic port position after layout, no schematic_port_id`
+      );
+    }
+    const schematic_port = db.schematic_port.get(this.schematic_port_id);
+    if (!schematic_port)
+      throw new Error(
+        `Schematic port not found when trying to get post-layout position: ${this.schematic_port_id}`
+      );
+    return schematic_port.center;
+  }
   /**
    * Smtpads and platedholes call this method to register themselves as a match
    * for this port. All the matching is done by primitives other than the Port,
@@ -1631,12 +1645,14 @@ var Port = class extends PrimitiveComponent {
     const { _parsedProps: props } = this;
     const container = this.getPrimitiveContainer();
     if (!container) return;
+    const containerCenter = container._getGlobalSchematicPositionBeforeLayout();
     let center = this._getGlobalSchematicPositionBeforeLayout();
     if ("schematicDimensions" in container && props.pinNumber !== void 0) {
       const chipDims = container.schematicDimensions;
       center = chipDims.getPortPositionByPinNumber(props.pinNumber);
+      center.x += containerCenter.x;
+      center.y += containerCenter.y;
     }
-    const containerCenter = container._getGlobalSchematicPositionBeforeLayout();
     this.facingDirection = getRelativeDirection(containerCenter, center);
     const schematic_port = db.schematic_port.insert({
       schematic_component_id: this.parent?.schematic_component_id,
@@ -2378,6 +2394,7 @@ var TraceHint = class extends PrimitiveComponent {
 };
 
 // lib/components/primitive-components/Group.ts
+import * as SAL from "@tscircuit/schematic-autolayout";
 var Group = class extends NormalComponent {
   get config() {
     return {
@@ -2401,6 +2418,32 @@ var Group = class extends NormalComponent {
       );
     }
   }
+  doInitialSchematicLayout() {
+    if (!this.isSubcircuit) return;
+    const props = this._parsedProps;
+    if (!props.schAutoLayoutEnabled) return;
+    const { db } = this.root;
+    const descendants = this.getDescendants();
+    const components = [];
+    const ports = [];
+    for (const descendant of descendants) {
+      if ("schematic_component_id" in descendant) {
+        const component = db.schematic_component.get(
+          descendant.schematic_component_id
+        );
+        if (component) {
+          const schPorts = db.schematic_port.list().filter(
+            (p) => p.schematic_component_id === component.schematic_component_id
+          );
+          components.push(component);
+          ports.push(...schPorts);
+        }
+      }
+    }
+    const scene = SAL.convertSoupToScene(db.toArray());
+    const laidOutScene = SAL.ascendingCentralLrBug1(scene);
+    SAL.mutateSoupForScene(db.toArray(), laidOutScene);
+  }
 };
 
 // lib/components/normal-components/Board.ts
@@ -2481,22 +2524,6 @@ var computeObstacleBounds = (obstacles) => {
   return { minX, maxX, minY, maxY };
 };
 
-// lib/utils/projectPointInDirection.ts
-var projectPointInDirection = (point, direction, distance) => {
-  switch (direction) {
-    case "up":
-      return { x: point.x, y: point.y - distance };
-    case "down":
-      return { x: point.x, y: point.y + distance };
-    case "left":
-      return { x: point.x - distance, y: point.y };
-    case "right":
-      return { x: point.x + distance, y: point.y };
-    default:
-      throw new Error(`Unknown direction "${direction}"`);
-  }
-};
-
 // lib/utils/autorouting/findPossibleTraceLayerCombinations.ts
 var LAYER_SELECTION_PREFERENCE = ["top", "bottom", "inner1", "inner2"];
 var findPossibleTraceLayerCombinations = (hints, layer_path = []) => {
@@ -2644,6 +2671,45 @@ function tryNow(fn) {
 
 // lib/components/primitive-components/Trace.ts
 import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map";
+
+// lib/utils/autorouting/DirectLineRouter.ts
+var DirectLineRouter = class {
+  input;
+  constructor({ input }) {
+    this.input = input;
+  }
+  solveAndMapToTraces() {
+    const traces = [];
+    for (const connection of this.input.connections) {
+      if (connection.pointsToConnect.length !== 2) continue;
+      const [start, end] = connection.pointsToConnect;
+      const trace = {
+        type: "pcb_trace",
+        pcb_trace_id: "",
+        route: [
+          {
+            route_type: "wire",
+            x: start.x,
+            y: start.y,
+            layer: "top",
+            width: 0.1
+          },
+          {
+            route_type: "wire",
+            x: end.x,
+            y: end.y,
+            layer: "top",
+            width: 0.1
+          }
+        ]
+      };
+      traces.push(trace);
+    }
+    return traces;
+  }
+};
+
+// lib/components/primitive-components/Trace.ts
 var portToObjective = (port) => {
   const portPosition = port._getGlobalPcbPositionAfterLayout();
   return {
@@ -3069,29 +3135,34 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     }
     for (const { port } of ports) {
       connection.pointsToConnect.push({
-        ...projectPointInDirection(
-          port._getGlobalSchematicPositionBeforeLayout(),
-          port.facingDirection,
-          0.1501
-        ),
+        ...port._getGlobalSchematicPositionAfterLayout(),
+        // ...projectPointInDirection(
+        //   port._getGlobalSchematicPositionAfterLayout(),
+        //   port.facingDirection!,
+        //   0.1501,
+        // ),
         layer: "top"
       });
     }
     const bounds = computeObstacleBounds(obstacles);
     const simpleRouteJsonInput = {
       minTraceWidth: 0.1,
-      obstacles,
+      obstacles: [],
+      // leave empty to force traces to draw
       connections: [connection],
       bounds,
       layerCount: 1
     };
-    const autorouter = new IJumpAutorouter({
+    let Autorouter = IJumpAutorouter;
+    if (this.getSubcircuit().props._schDirectLineRoutingEnabled) {
+      Autorouter = DirectLineRouter;
+    }
+    const autorouter = new Autorouter({
       input: simpleRouteJsonInput
     });
-    const results = autorouter.solve();
+    const results = autorouter.solveAndMapToTraces();
     if (results.length === 0) return;
     const [result] = results;
-    if (!result.solved) return;
     const { route } = result;
     const edges = [];
     for (let i = 0; i < route.length - 1; i++) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.122",
+  "version": "0.0.124",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -35,10 +35,11 @@
   },
   "dependencies": {
     "@lume/kiwi": "^0.4.3",
-    "@tscircuit/footprinter": "^0.0.71",
+    "@tscircuit/footprinter": "^0.0.77",
     "@tscircuit/infgrid-ijump-astar": "^0.0.21",
     "@tscircuit/math-utils": "^0.0.4",
-    "@tscircuit/props": "^0.0.74",
+    "@tscircuit/props": "^0.0.75",
+    "@tscircuit/schematic-autolayout": "^0.0.5",
     "@tscircuit/soup-util": "^0.0.33",
     "circuit-json": "^0.0.86",
     "circuit-json-to-connectivity-map": "^0.0.17",