@tscircuit/cli 0.1.1150 → 0.1.1151

package/dist/cli/main.js

@@ -98175,7 +98175,7 @@ var import_perfect_cli = __toESM2(require_dist2(), 1);
 // lib/getVersion.ts
 import { createRequire as createRequire2 } from "node:module";
 // package.json
-var version = "0.1.1149";
+var version = "0.1.1150";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -98217,7 +98217,7 @@ var package_default = {
     cosmiconfig: "^9.0.0",
     debug: "^4.4.0",
     delay: "^6.0.0",
-    "dsn-converter": "^0.0.63",
+    "dsn-converter": "0.0.86",
     easyeda: "^0.0.252",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
@@ -242126,33 +242126,31 @@ import {
 } from "circuit-to-svg";
 
 // node_modules/dsn-converter/dist/index.js
-import { applyToPoint as applyToPoint21, scale as scale6 } from "transformation-matrix";
 import { su as su7 } from "@tscircuit/soup-util";
+import { applyToPoint as applyToPoint21, scale as scale6 } from "transformation-matrix";
 import { su as su23 } from "@tscircuit/soup-util";
 import Debug4 from "debug";
 import { su as su33 } from "@tscircuit/soup-util";
 import { applyToPoint as applyToPoint22, scale as scale22 } from "transformation-matrix";
 import { su as su42 } from "@tscircuit/soup-util";
 import Debug22 from "debug";
-import { su as su5 } from "@tscircuit/soup-util";
-import { scale as scale32 } from "transformation-matrix";
-import { scale as scale42, applyToPoint as applyToPoint102 } from "transformation-matrix";
-import { applyToPoint as applyToPoint42 } from "transformation-matrix";
+import { scale as scale32, applyToPoint as applyToPoint92 } from "transformation-matrix";
+import { applyToPoint as applyToPoint32 } from "transformation-matrix";
 import Debug32 from "debug";
 import"transformation-matrix";
+import { applyToPoint as applyToPoint42 } from "transformation-matrix";
 import { applyToPoint as applyToPoint52 } from "transformation-matrix";
-import { applyToPoint as applyToPoint62 } from "transformation-matrix";
 import Debug42 from "debug";
 import Debug6 from "debug";
-import { applyToPoint as applyToPoint72 } from "transformation-matrix";
+import { applyToPoint as applyToPoint62 } from "transformation-matrix";
 import Debug5 from "debug";
-import { applyToPoint as applyToPoint92 } from "transformation-matrix";
-import { su as su62 } from "@tscircuit/soup-util";
+import { applyToPoint as applyToPoint82 } from "transformation-matrix";
+import { su as su5 } from "@tscircuit/soup-util";
 import"transformation-matrix";
+import { su as su62 } from "@tscircuit/soup-util";
 import Debug7 from "debug";
-import { applyToPoint as applyToPoint122, scale as scale5 } from "transformation-matrix";
+import { applyToPoint as applyToPoint112, scale as scale42 } from "transformation-matrix";
 import"transformation-matrix";
-import { su as su72 } from "@tscircuit/soup-util";
 import Debug10 from "debug";
 import Debug8 from "debug";
 import Debug9 from "debug";
@@ -242282,6 +242280,81 @@ function createRectangularPadstack(name, width, height, layer) {
     attach: "off"
   };
 }
+function createCircularHoleRectangularPadstack(name, outerWidth, outerHeight, holeDiameter) {
+  const halfWidth = outerWidth / 2;
+  const halfHeight = outerHeight / 2;
+  const rectPolygon = [
+    -halfWidth,
+    halfHeight,
+    halfWidth,
+    halfHeight,
+    halfWidth,
+    -halfHeight,
+    -halfWidth,
+    -halfHeight,
+    -halfWidth,
+    halfHeight
+  ];
+  return {
+    name,
+    shapes: [
+      {
+        shapeType: "polygon",
+        layer: "F.Cu",
+        width: 0,
+        coordinates: rectPolygon
+      },
+      {
+        shapeType: "polygon",
+        layer: "B.Cu",
+        width: 0,
+        coordinates: rectPolygon
+      }
+    ],
+    hole: {
+      shape: "circle",
+      diameter: holeDiameter
+    },
+    attach: "off"
+  };
+}
+function createAndAddPadstackFromPcbSmtPad(pcb, pad2, processedPadstacks) {
+  const isCircle = pad2.shape === "circle";
+  const padstackParams = {
+    shape: isCircle ? "circle" : "rect",
+    outerDiameter: isCircle ? pad2.radius * 1000 * 2 : undefined,
+    holeDiameter: isCircle ? pad2.radius * 1000 * 2 : undefined,
+    width: isCircle ? undefined : pad2.width * 1000,
+    height: isCircle ? undefined : pad2.height * 1000,
+    layer: pad2.layer
+  };
+  const padstackName = getPadstackName(padstackParams);
+  if (!processedPadstacks.has(padstackName)) {
+    const padstack = isCircle ? createCircularPadstack(padstackName, padstackParams.outerDiameter, padstackParams.holeDiameter) : createRectangularPadstack(padstackName, padstackParams.width, padstackParams.height, pad2.layer);
+    pcb.library.padstacks.push(padstack);
+    processedPadstacks.add(padstackName);
+  }
+  return padstackName;
+}
+function createPinForImage(pad2, pcbComponent, sourcePort) {
+  if (!sourcePort)
+    return;
+  const isCircle = pad2.shape === "circle";
+  const padstackParams = {
+    shape: isCircle ? "circle" : "rect",
+    outerDiameter: isCircle ? pad2.radius * 1000 * 2 : undefined,
+    holeDiameter: isCircle ? pad2.radius * 1000 * 2 : undefined,
+    width: isCircle ? undefined : pad2.width * 1000,
+    height: isCircle ? undefined : pad2.height * 1000,
+    layer: pad2.layer
+  };
+  return {
+    padstack_name: getPadstackName(padstackParams),
+    pin_number: sourcePort.port_hints?.find((hint) => !Number.isNaN(Number(hint))) || 1,
+    x: (pad2.x - pcbComponent.center.x) * 1000,
+    y: (pad2.y - pcbComponent.center.y) * 1000
+  };
+}
 var transformMmToUm = scale6(1000);
 function processComponentsAndPads(componentGroups, circuitElements, pcb) {
   const processedPadstacks = /* @__PURE__ */ new Set;
@@ -242315,42 +242388,16 @@ function processComponentsAndPads(componentGroups, circuitElements, pcb) {
     if (!componentGroup)
       continue;
     for (const pad2 of componentGroup.pcb_smtpads) {
-      if (pad2.shape === "rect") {
-        const padstackName = getPadstackName({
-          shape: "rect",
-          width: pad2.width * 1000,
-          height: pad2.height * 1000,
-          layer: pad2.layer
-        });
-        if (!processedPadstacks.has(padstackName)) {
-          const padWidthInUm = Math.round(pad2.width * 1000);
-          const padHeightInUm = Math.round(pad2.height * 1000);
-          const padstack = createRectangularPadstack(padstackName, padWidthInUm, padHeightInUm, pad2.layer);
-          pcb.library.padstacks.push(padstack);
-          processedPadstacks.add(padstackName);
-        }
-      }
+      createAndAddPadstackFromPcbSmtPad(pcb, pad2, processedPadstacks);
     }
     const image = {
       name: footprintName,
       outlines: [],
       pins: componentGroup.pcb_smtpads.map((pad2) => {
         const pcbComponent = circuitElements.find((e4) => e4.type === "pcb_component" && e4.source_component_id === firstComponent.sourceComponent?.source_component_id);
-        if (pad2.shape === "rect") {
-          const pcbPort = su7(circuitElements).pcb_port.list().find((e4) => e4.pcb_port_id === pad2.pcb_port_id);
-          const sourcePort = su7(circuitElements).source_port.list().find((e4) => e4.source_port_id === pcbPort?.source_port_id);
-          return {
-            padstack_name: getPadstackName({
-              shape: "rect",
-              width: pad2.width * 1000,
-              height: pad2.height * 1000,
-              layer: pad2.layer
-            }),
-            pin_number: sourcePort?.port_hints?.find((hint) => !Number.isNaN(Number(hint))) || 1,
-            x: (pad2.x - pcbComponent.center.x) * 1000,
-            y: (pad2.y - pcbComponent.center.y) * 1000
-          };
-        }
+        const pcbPort = su7(circuitElements).pcb_port.list().find((e4) => e4.pcb_port_id === pad2.pcb_port_id);
+        const sourcePort = su7(circuitElements).source_port.list().find((e4) => e4.source_port_id === pcbPort?.source_port_id);
+        return createPinForImage(pad2, pcbComponent, sourcePort);
       }).filter((pin) => pin !== undefined)
     };
     pcb.library.images.push(image);
@@ -242394,6 +242441,7 @@ function processNets(circuitElements, pcb) {
     }
   }
   const netMap = /* @__PURE__ */ new Map;
+  const netTraceWidthMap = /* @__PURE__ */ new Map;
   for (const element of circuitElements) {
     if (element.type === "source_trace" && element.connected_source_port_ids) {
       const connectedPorts = element.connected_source_port_ids;
@@ -242410,6 +242458,10 @@ function processNets(circuitElements, pcb) {
               netMap.get(netName)?.add(`${padInfo.componentName}-${padInfo.pinNumber}`);
             }
           }
+          if ("min_trace_thickness" in element && element.min_trace_thickness) {
+            const traceWidthMicrons = element.min_trace_thickness * 1000;
+            netTraceWidthMap.set(netName, traceWidthMicrons);
+          }
         }
       }
     }
@@ -242429,6 +242481,13 @@ function processNets(circuitElements, pcb) {
         const connectedTraces = circuitElements.filter((e4) => e4.type === "source_trace" && e4.connected_source_net_ids?.includes(element.source_net_id) && e4.connected_source_port_ids?.includes(sourcePortId));
         if (connectedTraces.length > 0) {
           isInSourceNet = true;
+          for (const trace of connectedTraces) {
+            if ("min_trace_thickness" in trace && trace.min_trace_thickness) {
+              const traceWidthMicrons = trace.min_trace_thickness * 1000;
+              netTraceWidthMap.set(`${element.name}_${element.source_net_id}`, traceWidthMicrons);
+              break;
+            }
+          }
           break;
         }
       }
@@ -242452,6 +242511,10 @@ function processNets(circuitElements, pcb) {
             netMap.get(netName)?.add(`${padInfo.componentName}-${padInfo.pinNumber}`);
           }
         }
+        if ("min_trace_thickness" in trace && trace.min_trace_thickness && !netTraceWidthMap.has(netName)) {
+          const traceWidthMicrons = trace.min_trace_thickness * 1000;
+          netTraceWidthMap.set(netName, traceWidthMicrons);
+        }
       }
     }
   }
@@ -242470,13 +242533,56 @@ function processNets(circuitElements, pcb) {
       return 1;
     return a2.localeCompare(b);
   });
+  const traceWidthClassMap = /* @__PURE__ */ new Map;
+  const defaultTraceWidth = 200;
+  traceWidthClassMap.set(defaultTraceWidth, "kicad_default");
+  for (const [netName, traceWidth] of netTraceWidthMap.entries()) {
+    if (traceWidth !== defaultTraceWidth && !traceWidthClassMap.has(traceWidth)) {
+      const className = `trace_width_${traceWidth}um`;
+      traceWidthClassMap.set(traceWidth, className);
+      pcb.network.classes.push({
+        name: className,
+        description: `Trace width ${traceWidth}μm`,
+        net_names: [],
+        circuit: {
+          use_via: "Via[0-1]_600:300_um"
+        },
+        rule: {
+          clearances: [
+            {
+              value: 200,
+              type: ""
+            }
+          ],
+          width: traceWidth
+        }
+      });
+    }
+  }
+  const netsByClass = /* @__PURE__ */ new Map;
   for (const netName of allNets) {
+    const traceWidth = netTraceWidthMap.get(netName) || defaultTraceWidth;
+    const className = traceWidthClassMap.get(traceWidth) || "kicad_default";
+    if (!netsByClass.has(className)) {
+      netsByClass.set(className, []);
+    }
+    netsByClass.get(className)?.push(netName);
     pcb.network.nets.push({
       name: netName,
       pins: Array.from(netMap.get(netName) || []).map((pin) => pin.replace("pin", ""))
     });
   }
-  pcb.network.classes[0].net_names = allNets;
+  for (const [className, nets] of netsByClass.entries()) {
+    const classIndex = pcb.network.classes.findIndex((c3) => c3.name === className);
+    if (classIndex !== -1) {
+      pcb.network.classes[classIndex].net_names = nets;
+    }
+  }
+  for (const classObj of pcb.network.classes) {
+    if (classObj.net_names.length === 0) {
+      classObj.net_names = allNets;
+    }
+  }
 }
 function findOrCreateViaPadstack(pcb, outerDiameter, holeDiameter) {
   const viaName = `Via[0-1]_${outerDiameter}:${holeDiameter}_um`;
@@ -242563,7 +242669,7 @@ function createWire(opts) {
   return {
     path: {
       layer: opts.layer === "top" ? "F.Cu" : "B.Cu",
-      width: opts.widthMm * 1000,
+      width: opts.widthMm,
       coordinates: []
     },
     net: opts.netName,
@@ -242598,7 +242704,7 @@ function processPcbTraces(circuitElements, pcb) {
           if (isFirstPoint) {
             currentWire = createWire({
               layer: point5.layer,
-              widthMm: point5.width,
+              widthMm: point5.width * CJ_TO_DSN_SCALE,
               netName
             });
             dsnWrapper.addWire(currentWire);
@@ -242667,123 +242773,164 @@ function processPcbTraces(circuitElements, pcb) {
 var transformMmToUm2 = scale22(1000);
 function processPlatedHoles(componentGroups, circuitElements, pcb) {
   const processedPadstacks = /* @__PURE__ */ new Set;
-  const componentsByFootprint = /* @__PURE__ */ new Map;
-  for (const group of componentGroups) {
-    const { pcb_component_id, pcb_plated_holes, pcb_smtpads } = group;
-    if (pcb_plated_holes.length === 0)
-      continue;
-    const pcbComponent = su42(circuitElements).pcb_component.list().find((e4) => e4.pcb_component_id === pcb_component_id);
-    const sourceComponent = pcbComponent && su42(circuitElements).source_component.list().find((e4) => e4.source_component_id === pcbComponent.source_component_id);
-    if (!pcbComponent)
-      continue;
-    const footprintName = getFootprintName(sourceComponent, pcbComponent);
-    const componentName = sourceComponent.name || "Unknown";
-    const circuitSpaceCoordinates = applyToPoint22(transformMmToUm2, pcbComponent.center);
-    if (pcb_smtpads.length === 0) {
-      if (!componentsByFootprint.has(footprintName)) {
-        componentsByFootprint.set(footprintName, []);
-      }
-      componentsByFootprint.get(footprintName)?.push({
-        componentName,
-        coordinates: circuitSpaceCoordinates,
-        rotation: pcbComponent?.rotation || 0,
-        value: getComponentValue(sourceComponent),
-        sourceComponent
-      });
-    }
-    for (const hole of pcb_plated_holes) {
-      if (hole.shape === "circle") {
-        const padstackName = getPadstackName({
+  function ensurePadstack(hole) {
+    switch (hole.shape) {
+      case "circle": {
+        const name = getPadstackName({
           shape: "circle",
           holeDiameter: hole.hole_diameter * 1000,
           outerDiameter: hole.outer_diameter * 1000,
           layer: "all"
         });
-        if (!processedPadstacks.has(padstackName)) {
-          const padDiameterInUm = Math.round(hole.outer_diameter * 1000);
-          pcb.library.padstacks.push(createCircularPadstack(padstackName, padDiameterInUm, padDiameterInUm));
-          processedPadstacks.add(padstackName);
+        if (!processedPadstacks.has(name)) {
+          const d3 = Math.round(hole.outer_diameter * 1000);
+          pcb.library.padstacks.push(createCircularPadstack(name, d3, d3));
+          processedPadstacks.add(name);
         }
-      } else if (hole.shape === "oval" || hole.shape === "pill") {
-        const padstackName = getPadstackName({
+        return name;
+      }
+      case "oval":
+      case "pill": {
+        const name = getPadstackName({
           shape: hole.shape,
           width: hole.hole_width * 1000,
           height: hole.hole_height * 1000,
           layer: "all"
         });
-        if (!processedPadstacks.has(padstackName)) {
-          const padInnerWidthInUm = Math.round(hole.hole_width * 1000);
-          const padInnerHeightInUm = Math.round(hole.hole_height * 1000);
-          const padOuterWidthInUm = Math.round(hole.outer_width * 1000);
-          const padOuterHeightInUm = Math.round(hole.outer_height * 1000);
-          pcb.library.padstacks.push(createOvalPadstack(padstackName, padOuterWidthInUm, padOuterHeightInUm, padInnerWidthInUm, padInnerHeightInUm));
-          processedPadstacks.add(padstackName);
+        if (!processedPadstacks.has(name)) {
+          const iW = Math.round(hole.hole_width * 1000);
+          const iH = Math.round(hole.hole_height * 1000);
+          const oW = Math.round(hole.outer_width * 1000);
+          const oH = Math.round(hole.outer_height * 1000);
+          pcb.library.padstacks.push(createOvalPadstack(name, oW, oH, iW, iH));
+          processedPadstacks.add(name);
         }
+        return name;
       }
+      case "circular_hole_with_rect_pad": {
+        const name = getPadstackName({
+          shape: "rect",
+          width: hole.rect_pad_width * 1000,
+          height: hole.rect_pad_height * 1000,
+          layer: "all"
+        });
+        if (!processedPadstacks.has(name)) {
+          const oW = Math.round(hole.rect_pad_width * 1000);
+          const oH = Math.round(hole.rect_pad_height * 1000);
+          const hD = Math.round(hole.hole_diameter * 1000);
+          pcb.library.padstacks.push(createCircularHoleRectangularPadstack(name, oW, oH, hD));
+          processedPadstacks.add(name);
+        }
+        return name;
+      }
+      default:
+        throw new Error(`Unsupported plated-hole shape: ${hole.shape}`);
+    }
+  }
+  function ensureImage(name) {
+    let image = pcb.library.images.find((img) => img.name === name);
+    if (!image) {
+      image = { name, outlines: [], pins: [] };
+      pcb.library.images.push(image);
     }
-    let existingImage = pcb.library.images.find((img) => img.name === footprintName);
-    if (!existingImage) {
-      existingImage = {
-        name: footprintName,
-        outlines: [],
-        pins: []
+    return image;
+  }
+  function createNextPinNumberGenerator(image) {
+    let current2 = image.pins.reduce((max, p3) => {
+      const n3 = Number(typeof p3.pin_number === "string" ? p3.pin_number.replace(/pin/i, "") : p3.pin_number);
+      return Number.isNaN(n3) ? max : Math.max(max, n3);
+    }, 0) + 1;
+    return () => current2++;
+  }
+  function findNumericHint(port) {
+    const hint = port?.port_hints?.find((h4) => !Number.isNaN(Number(h4)));
+    return hint !== undefined ? Number(hint) : undefined;
+  }
+  const componentsByFootprint = /* @__PURE__ */ new Map;
+  for (const group of componentGroups) {
+    const { pcb_component_id, pcb_plated_holes, pcb_smtpads } = group;
+    if (pcb_plated_holes.length === 0)
+      continue;
+    const pcbComponent = su42(circuitElements).pcb_component.list().find((e4) => e4.pcb_component_id === pcb_component_id);
+    if (!pcbComponent)
+      continue;
+    const sourceComponent = su42(circuitElements).source_component.list().find((e4) => e4.source_component_id === pcbComponent.source_component_id);
+    const footprintName = getFootprintName(sourceComponent, pcbComponent);
+    const image = ensureImage(footprintName);
+    const nextPinNumber = createNextPinNumberGenerator(image);
+    for (const hole of pcb_plated_holes) {
+      const padstackName = ensurePadstack(hole);
+      const pcbPort = hole.pcb_port_id ? su42(circuitElements).pcb_port.list().find((e4) => e4.pcb_port_id === hole.pcb_port_id) : undefined;
+      const sourcePort = pcbPort ? su42(circuitElements).source_port.list().find((e4) => e4.source_port_id === pcbPort.source_port_id) : undefined;
+      const pinNumber = findNumericHint(sourcePort) ?? nextPinNumber();
+      const pin = {
+        padstack_name: padstackName,
+        pin_number: pinNumber,
+        x: (Number(hole.x.toFixed(3)) - pcbComponent.center.x) * 1000,
+        y: (Number(hole.y.toFixed(3)) - pcbComponent.center.y) * 1000
       };
-      pcb.library.images.push(existingImage);
+      const duplicate = image.pins.some((p3) => p3.x === pin.x && p3.y === pin.y && p3.padstack_name === pin.padstack_name);
+      if (!duplicate)
+        image.pins.push(pin);
+    }
+    if (pcb_smtpads.length === 0) {
+      const key = footprintName;
+      if (!componentsByFootprint.has(key))
+        componentsByFootprint.set(key, []);
+      componentsByFootprint.get(key).push({
+        componentName: sourceComponent?.name || "Unknown",
+        coordinates: applyToPoint22(transformMmToUm2, pcbComponent.center),
+        rotation: pcbComponent.rotation || 0,
+        value: getComponentValue(sourceComponent),
+        sourceComponent
+      });
     }
-    const platedHolePins = pcb_plated_holes.map((hole) => {
-      const pcbPort = su42(circuitElements).pcb_port.list().find((e4) => e4.pcb_port_id === hole.pcb_port_id);
-      const sourcePort = pcbPort && su42(circuitElements).source_port.list().find((e4) => e4.source_port_id === pcbPort.source_port_id);
-      if (hole.shape === "circle") {
-        const pin = {
-          padstack_name: getPadstackName({
-            shape: "circle",
-            holeDiameter: hole.hole_diameter * 1000,
-            outerDiameter: hole.outer_diameter * 1000,
-            layer: "all"
-          }),
-          pin_number: sourcePort?.port_hints?.find((hint) => !Number.isNaN(Number(hint))) || 1,
-          x: (Number(hole.x.toFixed(3)) - pcbComponent.center.x) * 1000,
-          y: (Number(hole.y.toFixed(3)) - pcbComponent.center.y) * 1000
-        };
-        return !existingImage.pins.some((existingPin) => {
-          const samePinNumber = existingPin.pin_number === pin.pin_number;
-          const samePositionAndPadstack = existingPin.x === pin.x && existingPin.y === pin.y && existingPin.padstack_name === pin.padstack_name;
-          return samePinNumber || samePositionAndPadstack;
-        }) ? pin : undefined;
-      } else if (hole.shape === "oval" || hole.shape === "pill") {
-        const pin = {
-          padstack_name: getPadstackName({
-            shape: hole.shape,
-            width: hole.hole_width * 1000,
-            height: hole.hole_height * 1000,
-            layer: "all"
-          }),
-          pin_number: sourcePort?.port_hints?.find((hint) => !Number.isNaN(Number(hint))) || 1,
-          x: (Number(hole.x.toFixed(3)) - pcbComponent.center.x) * 1000,
-          y: (Number(hole.y.toFixed(3)) - pcbComponent.center.y) * 1000
-        };
-        return !existingImage.pins.some((existingPin) => existingPin.x === pin.x && existingPin.y === pin.y && existingPin.padstack_name === pin.padstack_name) ? pin : undefined;
-      }
-    }).filter((pin) => pin !== undefined);
-    existingImage.pins.push(...platedHolePins);
   }
-  for (const [footprintName, components] of componentsByFootprint) {
-    const componentEntry = {
-      name: footprintName,
-      places: components.map((component) => ({
-        refdes: `${component.componentName}_${component.sourceComponent?.source_component_id}`,
-        x: component.coordinates.x,
-        y: component.coordinates.y,
+  for (const [footprint, comps] of componentsByFootprint) {
+    pcb.placement.components.push({
+      name: footprint,
+      places: comps.map((c3) => ({
+        refdes: `${c3.componentName}_${c3.sourceComponent?.source_component_id}`,
+        x: c3.coordinates.x,
+        y: c3.coordinates.y,
         side: "front",
-        rotation: component.rotation % 90,
-        PN: component.value
+        rotation: c3.rotation % 90,
+        PN: c3.value
       }))
-    };
-    pcb.placement.components.push(componentEntry);
+    });
+  }
+}
+function generateLayers(numLayers) {
+  const layers = [];
+  layers.push({
+    name: "F.Cu",
+    type: "signal",
+    property: {
+      index: 0
+    }
+  });
+  for (let i2 = 1;i2 < numLayers - 1; i2++) {
+    layers.push({
+      name: `In${i2}.Cu`,
+      type: "signal",
+      property: {
+        index: i2
+      }
+    });
   }
+  layers.push({
+    name: "B.Cu",
+    type: "signal",
+    property: {
+      index: numLayers - 1
+    }
+  });
+  return layers;
 }
-function convertCircuitJsonToDsnJson(circuitElements) {
+function convertCircuitJsonToDsnJson(circuitElements, options = {}) {
   const pcbBoard = circuitElements.find((element) => element.type === "pcb_board");
+  const numLayers = pcbBoard?.num_layers ?? 2;
+  const layers = generateLayers(numLayers);
   const pcb = {
     is_dsn_pcb: true,
     filename: "",
@@ -242799,22 +242946,7 @@ function convertCircuitJsonToDsnJson(circuitElements) {
     },
     unit: "um",
     structure: {
-      layers: [
-        {
-          name: "F.Cu",
-          type: "signal",
-          property: {
-            index: 0
-          }
-        },
-        {
-          name: "B.Cu",
-          type: "signal",
-          property: {
-            index: 1
-          }
-        }
-      ],
+      layers,
       boundary: {
         path: {
           layer: "pcb",
@@ -242826,11 +242958,7 @@ function convertCircuitJsonToDsnJson(circuitElements) {
       rule: {
         clearances: [
           {
-            value: 200
-          },
-          {
-            value: 200,
-            type: "default_smd"
+            value: options.traceClearance ?? 150
           },
           {
             value: 50,
@@ -242877,11 +243005,10 @@ function convertCircuitJsonToDsnJson(circuitElements) {
           rule: {
             clearances: [
               {
-                value: 200,
-                type: ""
+                value: options.traceClearance ?? 150
               }
             ],
-            width: 100
+            width: 150
           }
         }
       ]
@@ -243125,8 +243252,8 @@ var stringifyDsnJson = (dsnJson) => {
 `;
   return result;
 };
-var convertCircuitJsonToDsnString = (circuitJson) => {
-  const dsnJson = convertCircuitJsonToDsnJson(circuitJson);
+var convertCircuitJsonToDsnString = (circuitJson, options = {}) => {
+  const dsnJson = convertCircuitJsonToDsnJson(circuitJson, options);
   return stringifyDsnJson(dsnJson);
 };
 var debug33 = Debug32("dsn-converter:convertPadstacksToSmtpads");

package/dist/lib/index.js

@@ -60445,7 +60445,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1149";
+var version = "0.1.1150";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -60487,7 +60487,7 @@ var package_default = {
     cosmiconfig: "^9.0.0",
     debug: "^4.4.0",
     delay: "^6.0.0",
-    "dsn-converter": "^0.0.63",
+    "dsn-converter": "0.0.86",
     easyeda: "^0.0.252",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1150",
+  "version": "0.1.1151",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -39,7 +39,7 @@
     "cosmiconfig": "^9.0.0",
     "debug": "^4.4.0",
     "delay": "^6.0.0",
-    "dsn-converter": "^0.0.63",
+    "dsn-converter": "0.0.86",
     "easyeda": "^0.0.252",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",