circuit-json-to-kicad 0.0.24 → 0.0.26

package/dist/index.d.ts

@@ -13,6 +13,10 @@ interface PaperDimensions {
 type SchematicPortId = string;
 type SchematicTraceId = string;
 type PcbPortId = string;
+interface PcbNetInfo {
+    id: number;
+    name: string;
+}
 interface ConverterContext {
     db: CircuitJsonUtilObjects;
     circuitJson: CircuitJson;
@@ -33,7 +37,7 @@ interface ConverterContext {
         x: number;
         y: number;
     }>;
-    pcbNetMap?: Map<string, number>;
+    pcbNetMap?: Map<string, PcbNetInfo>;
 }
 declare abstract class ConverterStage<Input, Output> {
     MAX_ITERATIONS: number;

package/dist/index.js

@@ -1347,27 +1347,49 @@ var AddNetsStage = class extends ConverterStage {
     if (!kicadPcb) {
       throw new Error("KicadPcb instance not initialized in context");
     }
-    if (!this.ctx.pcbNetMap) {
-      this.ctx.pcbNetMap = /* @__PURE__ */ new Map();
-    }
-    const pcbTraces = this.ctx.db.pcb_trace.list();
-    const netNames = /* @__PURE__ */ new Set();
-    netNames.add("GND");
-    for (const trace of pcbTraces) {
-      if (trace.route && trace.route.length > 0) {
-        const netName = `Net-${trace.pcb_trace_id}`;
-        netNames.add(netName);
+    this.ctx.pcbNetMap = /* @__PURE__ */ new Map();
+    const netNameByKey = /* @__PURE__ */ new Map();
+    const sourceNets = this.ctx.db.source_net?.list() ?? [];
+    for (const sourceNet of sourceNets) {
+      const connectivityKey = sourceNet.subcircuit_connectivity_map_key || sourceNet.source_net_id;
+      if (!connectivityKey) continue;
+      const candidateName = sourceNet.name || sourceNet.source_net_id || "";
+      const netName = candidateName && candidateName.trim().length > 0 ? candidateName : connectivityKey;
+      netNameByKey.set(connectivityKey, netName);
+    }
+    const sourceTraces = this.ctx.db.source_trace?.list() ?? [];
+    for (const sourceTrace of sourceTraces) {
+      let connectivityKey = sourceTrace.subcircuit_connectivity_map_key;
+      if (!connectivityKey && sourceTrace.connected_source_net_ids?.length) {
+        for (const sourceNetId of sourceTrace.connected_source_net_ids) {
+          const connectedNet = this.ctx.db.source_net?.get(sourceNetId);
+          if (connectedNet?.subcircuit_connectivity_map_key && connectedNet.subcircuit_connectivity_map_key.length > 0) {
+            connectivityKey = connectedNet.subcircuit_connectivity_map_key;
+            break;
+          }
+        }
+      }
+      if (!connectivityKey) continue;
+      if (!netNameByKey.has(connectivityKey)) {
+        const candidateName = sourceTrace.display_name || sourceTrace.source_trace_id || "";
+        const netName = candidateName && candidateName.trim().length > 0 ? candidateName : connectivityKey;
+        netNameByKey.set(connectivityKey, netName);
       }
     }
-    let netNumber = 0;
-    for (const netName of Array.from(netNames).sort()) {
-      const net = new PcbNet(netNumber, netName);
-      const nets = kicadPcb.nets;
-      nets.push(net);
-      kicadPcb.nets = nets;
-      this.ctx.pcbNetMap.set(netName, netNumber);
+    const sortedEntries = Array.from(netNameByKey.entries()).sort(
+      (a, b) => a[0].localeCompare(b[0])
+    );
+    const nets = [];
+    nets.push(new PcbNet(0, ""));
+    let netNumber = 1;
+    for (const [connectivityKey, netName] of sortedEntries) {
+      const pcbNet = new PcbNet(netNumber, netName);
+      nets.push(pcbNet);
+      const netInfo = { id: netNumber, name: netName };
+      this.ctx.pcbNetMap.set(connectivityKey, netInfo);
       netNumber++;
     }
+    kicadPcb.nets = nets;
     this.finished = true;
   }
   getOutput() {
@@ -1386,7 +1408,8 @@ import {
   PadPrimitiveGrPoly,
   Pts as Pts3,
   Xy as Xy3,
-  PadOptions
+  PadOptions,
+  PadNet
 } from "kicadts";
 import {
   applyToPoint as applyToPoint5,
@@ -1399,7 +1422,8 @@ function createSmdPadFromCircuitJson({
   pcbPad,
   componentCenter,
   padNumber,
-  componentRotation = 0
+  componentRotation = 0,
+  netInfo
 }) {
   let padX;
   let padY;
@@ -1485,17 +1509,21 @@ function createSmdPadFromCircuitJson({
   if (padPrimitives) {
     pad.primitives = padPrimitives;
   }
+  if (netInfo) {
+    pad.net = new PadNet(netInfo.id, netInfo.name);
+  }
   return pad;
 }
 
 // lib/pcb/stages/utils/CreateThruHolePadFromCircuitJson.ts
-import { FootprintPad as FootprintPad2, PadDrill } from "kicadts";
+import { FootprintPad as FootprintPad2, PadDrill, PadNet as PadNet2 } from "kicadts";
 import { applyToPoint as applyToPoint6, rotate as rotate2, identity } from "transformation-matrix";
 function createThruHolePadFromCircuitJson({
   platedHole,
   componentCenter,
   padNumber,
-  componentRotation = 0
+  componentRotation = 0,
+  netInfo
 }) {
   if (!("x" in platedHole && "y" in platedHole)) {
     return null;
@@ -1511,11 +1539,27 @@ function createThruHolePadFromCircuitJson({
   let padSize;
   let drill;
   let rotation = 0;
+  const hasHoleOffset = "hole_offset_x" in platedHole || "hole_offset_y" in platedHole;
+  let drillOffset;
+  if (hasHoleOffset) {
+    const rawOffset = {
+      x: platedHole.hole_offset_x ?? 0,
+      y: platedHole.hole_offset_y ?? 0
+    };
+    if (rawOffset.x !== 0 || rawOffset.y !== 0) {
+      const rotatedOffset = applyToPoint6(rotationMatrix, {
+        x: -rawOffset.x,
+        y: rawOffset.y
+      });
+      drillOffset = rotatedOffset;
+    }
+  }
   if (platedHole.shape === "circle") {
     padShape = "circle";
     padSize = [platedHole.outer_diameter, platedHole.outer_diameter];
     drill = new PadDrill({
-      diameter: platedHole.hole_diameter
+      diameter: platedHole.hole_diameter,
+      offset: drillOffset
     });
   } else if (platedHole.shape === "pill" || platedHole.shape === "oval") {
     padShape = "oval";
@@ -1526,7 +1570,8 @@ function createThruHolePadFromCircuitJson({
     drill = new PadDrill({
       oval: true,
       diameter: platedHole.hole_width,
-      width: platedHole.hole_height
+      width: platedHole.hole_height,
+      offset: drillOffset
     });
   } else if (platedHole.shape === "pill_hole_with_rect_pad") {
     padShape = "rect";
@@ -1537,7 +1582,8 @@ function createThruHolePadFromCircuitJson({
     drill = new PadDrill({
       oval: true,
       diameter: platedHole.hole_width,
-      width: platedHole.hole_height
+      width: platedHole.hole_height,
+      offset: drillOffset
     });
   } else if (platedHole.shape === "circular_hole_with_rect_pad") {
     padShape = "rect";
@@ -1546,7 +1592,8 @@ function createThruHolePadFromCircuitJson({
       platedHole.rect_pad_height
     ];
     drill = new PadDrill({
-      diameter: platedHole.hole_diameter
+      diameter: platedHole.hole_diameter,
+      offset: drillOffset
     });
   } else if (platedHole.shape === "rotated_pill_hole_with_rect_pad") {
     padShape = "rect";
@@ -1557,15 +1604,16 @@ function createThruHolePadFromCircuitJson({
     drill = new PadDrill({
       oval: true,
       diameter: platedHole.hole_width,
-      width: platedHole.hole_height
+      width: platedHole.hole_height,
+      offset: drillOffset
     });
     rotation = platedHole.rect_ccw_rotation || 0;
   } else {
     padShape = "circle";
     padSize = [1.6, 1.6];
-    drill = new PadDrill({ diameter: 0.8 });
+    drill = new PadDrill({ diameter: 0.8, offset: drillOffset });
   }
-  return new FootprintPad2({
+  const pad = new FootprintPad2({
     number: String(padNumber),
     padType: "thru_hole",
     shape: padShape,
@@ -1576,6 +1624,10 @@ function createThruHolePadFromCircuitJson({
     removeUnusedLayers: false,
     uuid: crypto.randomUUID()
   });
+  if (netInfo) {
+    pad.net = new PadNet2(netInfo.id, netInfo.name);
+  }
+  return pad;
 }
 
 // lib/pcb/stages/utils/CreateNpthPadFromCircuitJson.ts
@@ -1687,6 +1739,18 @@ function createFpTextFromCircuitJson({
 var AddFootprintsStage = class extends ConverterStage {
   componentsProcessed = 0;
   pcbComponents = [];
+  getNetInfoForPcbPort(pcbPortId) {
+    if (!pcbPortId) return void 0;
+    const pcbPort = this.ctx.db.pcb_port?.get(pcbPortId);
+    if (!pcbPort) return void 0;
+    const sourcePortId = pcbPort.source_port_id;
+    if (!sourcePortId) return void 0;
+    const sourcePort = this.ctx.db.source_port?.get(sourcePortId);
+    if (!sourcePort) return void 0;
+    const connectivityKey = sourcePort.subcircuit_connectivity_map_key;
+    if (!connectivityKey) return void 0;
+    return this.ctx.pcbNetMap?.get(connectivityKey);
+  }
   constructor(input, ctx) {
     super(input, ctx);
     this.pcbComponents = this.ctx.db.pcb_component.list();
@@ -1737,11 +1801,13 @@ var AddFootprintsStage = class extends ConverterStage {
     const fpPads = footprint.fpPads;
     let padNumber = 1;
     for (const pcbPad of pcbPads) {
+      const netInfo = this.getNetInfoForPcbPort(pcbPad.pcb_port_id);
       const pad = createSmdPadFromCircuitJson({
         pcbPad,
         componentCenter: component.center,
         padNumber,
-        componentRotation: component.rotation || 0
+        componentRotation: component.rotation || 0,
+        netInfo
       });
       fpPads.push(pad);
       padNumber++;
@@ -1750,11 +1816,13 @@ var AddFootprintsStage = class extends ConverterStage {
       (hole) => hole.pcb_component_id === component.pcb_component_id
     ) || [];
     for (const platedHole of pcbPlatedHoles) {
+      const netInfo = this.getNetInfoForPcbPort(platedHole.pcb_port_id);
       const pad = createThruHolePadFromCircuitJson({
         platedHole,
         componentCenter: component.center,
         padNumber,
-        componentRotation: component.rotation || 0
+        componentRotation: component.rotation || 0,
+        netInfo
       });
       if (pad) {
         fpPads.push(pad);
@@ -1823,10 +1891,35 @@ var AddTracesStage = class extends ConverterStage {
         x: endPoint.x,
         y: endPoint.y
       });
-      let netNumber = 0;
+      let netInfo;
       if (pcbNetMap) {
-        const netName = `Net-${trace.pcb_trace_id}`;
-        netNumber = pcbNetMap.get(netName) ?? 0;
+        let connectivityKey = trace.subcircuit_connectivity_map_key;
+        if (!connectivityKey && trace.source_trace_id) {
+          const sourceTrace = this.ctx.db.source_trace?.get(
+            trace.source_trace_id
+          );
+          if (sourceTrace) {
+            connectivityKey = sourceTrace.subcircuit_connectivity_map_key;
+            if (!connectivityKey && sourceTrace.connected_source_net_ids?.length) {
+              for (const sourceNetId of sourceTrace.connected_source_net_ids) {
+                const sourceNet = this.ctx.db.source_net?.get(sourceNetId);
+                if (sourceNet?.subcircuit_connectivity_map_key) {
+                  connectivityKey = sourceNet.subcircuit_connectivity_map_key;
+                  break;
+                }
+              }
+            }
+          }
+        }
+        if (!connectivityKey && typeof trace.connection_name === "string") {
+          const sourceNet = this.ctx.db.source_net?.get(trace.connection_name);
+          if (sourceNet?.subcircuit_connectivity_map_key) {
+            connectivityKey = sourceNet.subcircuit_connectivity_map_key;
+          }
+        }
+        if (connectivityKey) {
+          netInfo = pcbNetMap.get(connectivityKey);
+        }
       }
       const layerMap = {
         top: "F.Cu",
@@ -1838,7 +1931,8 @@ var AddTracesStage = class extends ConverterStage {
         end: { x: transformedEnd.x, y: transformedEnd.y },
         layer: kicadLayer,
         width: trace.width || 0.25,
-        net: new SegmentNet(netNumber)
+        net: new SegmentNet(netInfo?.id ?? 0),
+        uuid: crypto.randomUUID()
       });
       const segments = kicadPcb.segments;
       segments.push(segment);
@@ -1878,16 +1972,53 @@ var AddViasStage = class extends ConverterStage {
       x: via.x,
       y: via.y
     });
-    let netNumber = 0;
-    if (pcbNetMap && via.net_name) {
-      netNumber = pcbNetMap.get(via.net_name) ?? 0;
+    let netInfo;
+    if (pcbNetMap) {
+      let connectivityKey = via.subcircuit_connectivity_map_key;
+      if (!connectivityKey && via.pcb_trace_id) {
+        const pcbTrace = this.ctx.db.pcb_trace?.get(via.pcb_trace_id);
+        if (pcbTrace) {
+          if ("subcircuit_connectivity_map_key" in pcbTrace) {
+            connectivityKey = pcbTrace.subcircuit_connectivity_map_key;
+          }
+          if (!connectivityKey && pcbTrace.source_trace_id) {
+            const sourceTrace = this.ctx.db.source_trace?.get(
+              pcbTrace.source_trace_id
+            );
+            if (sourceTrace) {
+              if ("subcircuit_connectivity_map_key" in sourceTrace) {
+                connectivityKey = sourceTrace.subcircuit_connectivity_map_key;
+              }
+              if (!connectivityKey && sourceTrace.connected_source_net_ids?.length) {
+                for (const sourceNetId of sourceTrace.connected_source_net_ids) {
+                  const sourceNet = this.ctx.db.source_net?.get(sourceNetId);
+                  if (sourceNet?.subcircuit_connectivity_map_key) {
+                    connectivityKey = sourceNet.subcircuit_connectivity_map_key;
+                    break;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      if (!connectivityKey && via.connection_name) {
+        const sourceNet = this.ctx.db.source_net?.get(via.connection_name);
+        if (sourceNet?.subcircuit_connectivity_map_key) {
+          connectivityKey = sourceNet.subcircuit_connectivity_map_key;
+        }
+      }
+      if (connectivityKey) {
+        netInfo = pcbNetMap.get(connectivityKey);
+      }
     }
     const kicadVia = new Via({
       at: [transformedPos.x, transformedPos.y],
       size: via.outer_diameter || 0.8,
       drill: via.hole_diameter || 0.4,
       layers: ["F.Cu", "B.Cu"],
-      net: new ViaNet(netNumber)
+      net: new ViaNet(netInfo?.id ?? 0),
+      uuid: crypto.randomUUID()
     });
     const vias = kicadPcb.vias;
     vias.push(kicadVia);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-kicad",
   "main": "dist/index.js",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "type": "module",
   "files": [
     "dist"