@tscircuit/core 0.0.697 → 0.0.699

package/dist/index.d.ts

@@ -868,12 +868,18 @@ declare const portProps: z.ZodObject<{
     name: z.ZodOptional<z.ZodString>;
     pinNumber: z.ZodOptional<z.ZodNumber>;
     aliases: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    layer: z.ZodOptional<z.ZodString>;
+    layers: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 }, "strip", z.ZodTypeAny, {
     name?: string | undefined;
+    layer?: string | undefined;
+    layers?: string[] | undefined;
     pinNumber?: number | undefined;
     aliases?: string[] | undefined;
 }, {
     name?: string | undefined;
+    layer?: string | undefined;
+    layers?: string[] | undefined;
     pinNumber?: number | undefined;
     aliases?: string[] | undefined;
 }>;
@@ -891,12 +897,18 @@ declare class Port extends PrimitiveComponent<typeof portProps> {
             name: z.ZodOptional<z.ZodString>;
             pinNumber: z.ZodOptional<z.ZodNumber>;
             aliases: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            layer: z.ZodOptional<z.ZodString>;
+            layers: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
         }, "strip", z.ZodTypeAny, {
             name?: string | undefined;
+            layer?: string | undefined;
+            layers?: string[] | undefined;
             pinNumber?: number | undefined;
             aliases?: string[] | undefined;
         }, {
             name?: string | undefined;
+            layer?: string | undefined;
+            layers?: string[] | undefined;
             pinNumber?: number | undefined;
             aliases?: string[] | undefined;
         }>;
@@ -13325,52 +13337,54 @@ declare class Via extends PrimitiveComponent<typeof viaProps> {
     pcb_via_id: string | null;
     matchedPort: Port | null;
     isPcbPrimitive: boolean;
+    source_manually_placed_via_id: string | null;
+    constructor(props: z.input<typeof viaProps>);
     get config(): {
         componentName: string;
-        zodProps: zod.ZodObject<{
-            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>>;
-            schX: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
-            schY: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
-            schRotation: 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, {
+        zodProps: z.ZodObject<{
+            pcbX: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
+            pcbY: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
+            pcbRotation: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
+            schX: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
+            schY: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
+            schRotation: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
+            layer: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, z.ZodObject<{
+                name: z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
+            }, "strip", z.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";
             }>>;
-            footprint: zod.ZodOptional<zod.ZodType<_tscircuit_props.FootprintProp, zod.ZodTypeDef, _tscircuit_props.FootprintProp>>;
-            relative: zod.ZodOptional<zod.ZodBoolean>;
-            schRelative: zod.ZodOptional<zod.ZodBoolean>;
-            pcbRelative: zod.ZodOptional<zod.ZodBoolean>;
+            footprint: z.ZodOptional<z.ZodType<_tscircuit_props.FootprintProp, z.ZodTypeDef, _tscircuit_props.FootprintProp>>;
+            relative: z.ZodOptional<z.ZodBoolean>;
+            schRelative: z.ZodOptional<z.ZodBoolean>;
+            pcbRelative: z.ZodOptional<z.ZodBoolean>;
         } & {
-            name: zod.ZodOptional<zod.ZodString>;
-            fromLayer: 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: z.ZodOptional<z.ZodString>;
+            fromLayer: z.ZodEffects<z.ZodUnion<[z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, z.ZodObject<{
+                name: z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
+            }, "strip", z.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";
             }>;
-            toLayer: 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, {
+            toLayer: z.ZodEffects<z.ZodUnion<[z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, z.ZodObject<{
+                name: z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
+            }, "strip", z.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";
             }>;
-            holeDiameter: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
-            outerDiameter: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
-            connectsTo: zod.ZodOptional<zod.ZodUnion<[zod.ZodString, zod.ZodArray<zod.ZodString, "many">]>>;
-        }, "strip", zod.ZodTypeAny, {
+            holeDiameter: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+            outerDiameter: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+            connectsTo: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+        }, "strip", z.ZodTypeAny, {
             holeDiameter: number;
             outerDiameter: number;
             fromLayer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
@@ -13437,6 +13451,10 @@ declare class Via extends PrimitiveComponent<typeof viaProps> {
         x: number;
         y: number;
     }): void;
+    _getLayers(): LayerRef[];
+    initPorts(): void;
+    doInitialPcbComponentRender(): void;
+    doInitialSourceRender(): void;
     doInitialPcbPrimitiveRender(): void;
 }
 

package/dist/index.js

@@ -3037,7 +3037,9 @@ var getCenterOfPcbPrimitives = (pcbPrimitives) => {
 var portProps = z6.object({
   name: z6.string().optional(),
   pinNumber: z6.number().optional(),
-  aliases: z6.array(z6.string()).optional()
+  aliases: z6.array(z6.string()).optional(),
+  layer: z6.string().optional(),
+  layers: z6.array(z6.string()).optional()
 });
 var Port = class extends PrimitiveComponent2 {
   source_port_id = null;
@@ -3217,6 +3219,9 @@ var Port = class extends PrimitiveComponent2 {
     return `.${this.parent?.props.name} > port.${this.props.name}`;
   }
   getAvailablePcbLayers() {
+    const { layer, layers } = this._parsedProps;
+    if (layers) return layers;
+    if (layer) return [layer];
     return Array.from(
       new Set(this.matchedComponents.flatMap((c) => c.getAvailablePcbLayers()))
     );
@@ -8104,7 +8109,10 @@ var getSimpleRouteJsonFromCircuitJson = ({
       };
     }
   }
-  const directTraceConnections = db.source_trace.list().map((trace) => {
+  const routedTraceIds = new Set(
+    db.pcb_trace.list().map((t) => t.source_trace_id).filter((id) => Boolean(id))
+  );
+  const directTraceConnections = db.source_trace.list().filter((trace) => !routedTraceIds.has(trace.source_trace_id)).map((trace) => {
     const connectedPorts = trace.connected_source_port_ids.map((id) => {
       const source_port = db.source_port.get(id);
       const pcb_port = db.pcb_port.getWhere({ source_port_id: id });
@@ -13261,10 +13269,18 @@ var SilkscreenLine = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/Via.ts
 import { viaProps } from "@tscircuit/props";
+import "zod";
 var Via = class extends PrimitiveComponent2 {
   pcb_via_id = null;
   matchedPort = null;
   isPcbPrimitive = true;
+  source_manually_placed_via_id = null;
+  constructor(props) {
+    super(props);
+    const layers = this._getLayers();
+    this._parsedProps.layers = layers;
+    this.initPorts();
+  }
   get config() {
     return {
       componentName: "Via",
@@ -13301,6 +13317,51 @@ var Via = class extends PrimitiveComponent2 {
       y: newCenter.y
     });
   }
+  _getLayers() {
+    const { fromLayer = "top", toLayer = "bottom" } = this._parsedProps;
+    if (fromLayer === toLayer) return [fromLayer];
+    return [fromLayer, toLayer];
+  }
+  initPorts() {
+    const layers = this._parsedProps.layers;
+    for (const layer of layers) {
+      const port2 = new Port({ name: layer, layer });
+      port2.registerMatch(this);
+      this.add(port2);
+    }
+    const port = new Port({ name: "pin1" });
+    port.registerMatch(this);
+    this.add(port);
+  }
+  doInitialPcbComponentRender() {
+    if (this.root?.pcbDisabled) return;
+    const { db } = this.root;
+    const { _parsedProps: props } = this;
+    const position = this._getGlobalPcbPositionBeforeLayout();
+    const subcircuit = this.getSubcircuit();
+    const pcb_component = db.pcb_component.insert({
+      center: position,
+      width: props.outerDiameter,
+      height: props.outerDiameter,
+      layer: props.fromLayer ?? "top",
+      rotation: 0,
+      source_component_id: this.source_component_id,
+      subcircuit_id: subcircuit?.subcircuit_id ?? void 0
+    });
+    this.pcb_component_id = pcb_component.pcb_component_id;
+  }
+  doInitialSourceRender() {
+    const { db } = this.root;
+    const { _parsedProps: props } = this;
+    const group = this.getGroup();
+    const subcircuit = this.getSubcircuit();
+    const source_via = db.source_manually_placed_via.insert({
+      source_group_id: group?.source_group_id,
+      source_net_id: props.net ?? "",
+      subcircuit_id: subcircuit?.subcircuit_id ?? void 0
+    });
+    this.source_component_id = source_via.source_manually_placed_via_id;
+  }
   doInitialPcbPrimitiveRender() {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
@@ -14296,7 +14357,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.696",
+  version: "0.0.698",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -14349,7 +14410,7 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.11",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.242",
+    "circuit-json": "^0.0.245",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.6",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.697",
+  "version": "0.0.699",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -54,7 +54,7 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.11",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.242",
+    "circuit-json": "^0.0.245",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.6",