circuit-json-to-gerber 0.0.55 → 0.0.56

package/dist/{chunk-64R4GN2C.js → chunk-6BPSJ3NY.js}

@@ -292,12 +292,117 @@ var ExcellonDrillBuilder = class {
 var excellonDrill = () => new ExcellonDrillBuilder();
 
 // src/excellon-drill/convert-soup-to-excellon-drill-commands.ts
+var getLayerCount = (circuitJson) => {
+  const board = circuitJson.find((element) => element.type === "pcb_board");
+  if (!board || typeof board.num_layers !== "number") {
+    return 2;
+  }
+  return Math.max(2, board.num_layers);
+};
+var getLayerNumber = (layer, layerCount) => {
+  if (layer === "top") return 1;
+  if (layer === "bottom") return layerCount;
+  const innerLayerMatch = layer.match(/^inner([1-6])$/);
+  if (innerLayerMatch) {
+    const innerLayerNumber = Number(innerLayerMatch[1]);
+    if (innerLayerNumber >= 1 && innerLayerNumber <= layerCount - 2) {
+      return innerLayerNumber + 1;
+    }
+  }
+  throw new Error(`Invalid layer "${layer}" for ${layerCount}-layer board`);
+};
+var normalizeLayerSpan = (span, layerCount) => {
+  const fromLayerNumber = getLayerNumber(span.from_layer, layerCount);
+  const toLayerNumber = getLayerNumber(span.to_layer, layerCount);
+  if (fromLayerNumber <= toLayerNumber) {
+    return span;
+  }
+  return {
+    from_layer: span.to_layer,
+    to_layer: span.from_layer
+  };
+};
+var getPlatedElementLayerSpan = (element, layerCount) => {
+  if (element.type !== "pcb_plated_hole" && element.type !== "pcb_via") {
+    return void 0;
+  }
+  if ("from_layer" in element && typeof element.from_layer === "string" && "to_layer" in element && typeof element.to_layer === "string") {
+    return normalizeLayerSpan(
+      {
+        from_layer: element.from_layer,
+        to_layer: element.to_layer
+      },
+      layerCount
+    );
+  }
+  let layers = [];
+  if ("layers" in element && Array.isArray(element.layers)) {
+    layers = element.layers;
+  }
+  if (layers.length > 0) {
+    const sortedLayers = [...layers].sort(
+      (a, b) => getLayerNumber(a, layerCount) - getLayerNumber(b, layerCount)
+    );
+    return {
+      from_layer: sortedLayers[0],
+      to_layer: sortedLayers[sortedLayers.length - 1]
+    };
+  }
+  return {
+    from_layer: "top",
+    to_layer: "bottom"
+  };
+};
+var getDefaultPlatedDrillLayerSpan = () => ({
+  from_layer: "top",
+  to_layer: "bottom"
+});
+var getRequestedLayerSpan = (layer_span) => {
+  if (layer_span) {
+    return layer_span;
+  }
+  return getDefaultPlatedDrillLayerSpan();
+};
+var isSameLayerSpan = (a, b, layerCount) => {
+  const normalizedA = normalizeLayerSpan(a, layerCount);
+  const normalizedB = normalizeLayerSpan(b, layerCount);
+  return normalizedA.from_layer === normalizedB.from_layer && normalizedA.to_layer === normalizedB.to_layer;
+};
+var shouldIncludeElement = ({
+  element,
+  is_plated,
+  layer_span,
+  layerCount
+}) => {
+  if (element.type !== "pcb_plated_hole" && element.type !== "pcb_hole" && element.type !== "pcb_via") {
+    return false;
+  }
+  if (!is_plated) return element.type === "pcb_hole";
+  if (element.type === "pcb_hole") return false;
+  const elementLayerSpan = getPlatedElementLayerSpan(element, layerCount);
+  if (!elementLayerSpan) return false;
+  const requestedLayerSpan = getRequestedLayerSpan(layer_span);
+  return isSameLayerSpan(elementLayerSpan, requestedLayerSpan, layerCount);
+};
+var getFileFunctionLayerSpan = ({
+  circuitJson,
+  is_plated,
+  layer_span
+}) => {
+  const layerCount = getLayerCount(circuitJson);
+  if (!is_plated) return `NonPlated,1,${layerCount},NPTH`;
+  const requestedLayerSpan = getRequestedLayerSpan(layer_span);
+  const span = normalizeLayerSpan(requestedLayerSpan, layerCount);
+  return `Plated,${getLayerNumber(span.from_layer, layerCount)},${getLayerNumber(span.to_layer, layerCount)},PTH`;
+};
 var convertSoupToExcellonDrillCommands = ({
   circuitJson,
   is_plated,
-  flip_y_axis = false
+  flip_y_axis = false,
+  layer_span
 }) => {
   const builder = excellonDrill();
+  const layerCount = getLayerCount(circuitJson);
   builder.add("M48", {});
   const date_str = (/* @__PURE__ */ new Date()).toISOString();
   builder.add("header_comment", {
@@ -312,15 +417,21 @@ var convertSoupToExcellonDrillCommands = ({
     attribute_value: "tscircuit"
   }).add("header_attribute", {
     attribute_name: "TF.FileFunction",
-    attribute_value: is_plated ? "Plated,1,2,PTH" : "NonPlated,1,2,NPTH"
+    attribute_value: getFileFunctionLayerSpan({
+      circuitJson,
+      is_plated,
+      layer_span
+    })
   }).add("FMAT", { format: 2 }).add("unit_format", { unit: "METRIC", lz: null });
   let tool_counter = 10;
   const diameterToToolNumber = {};
   for (const element of circuitJson) {
-    if (element.type !== "pcb_plated_hole" && element.type !== "pcb_hole" && element.type !== "pcb_via") {
-      continue;
-    }
-    if (!is_plated && (element.type === "pcb_plated_hole" || element.type === "pcb_via")) {
+    if (!shouldIncludeElement({
+      element,
+      is_plated,
+      layer_span,
+      layerCount
+    })) {
       continue;
     }
     const holeDiameter = "hole_diameter" in element && typeof element.hole_diameter === "number" ? element.hole_diameter : "hole_width" in element && typeof element.hole_width === "number" && "hole_height" in element && typeof element.hole_height === "number" ? Math.min(element.hole_width, element.hole_height) : void 0;
@@ -344,7 +455,12 @@ var convertSoupToExcellonDrillCommands = ({
     builder.add("use_tool", { tool_number: i });
     for (const element of circuitJson) {
       if (element.type === "pcb_plated_hole" || element.type === "pcb_hole" || element.type === "pcb_via") {
-        if (!is_plated && (element.type === "pcb_plated_hole" || element.type === "pcb_via")) {
+        if (!shouldIncludeElement({
+          element,
+          is_plated,
+          layer_span,
+          layerCount
+        })) {
           continue;
         }
         const holeDiameter = "hole_diameter" in element && typeof element.hole_diameter === "number" ? element.hole_diameter : "hole_width" in element && typeof element.hole_width === "number" && "hole_height" in element && typeof element.hole_height === "number" ? Math.min(element.hole_width, element.hole_height) : void 0;
@@ -408,6 +524,59 @@ var convertSoupToExcellonDrillCommands = ({
   builder.add("M30", {});
   return builder.build();
 };
+var getDrillLayerSpanKey = (span, layerCount) => {
+  const normalizedSpan = normalizeLayerSpan(span, layerCount);
+  return `L${getLayerNumber(normalizedSpan.from_layer, layerCount)}-L${getLayerNumber(normalizedSpan.to_layer, layerCount)}`;
+};
+var hasDrillGeometry = (element) => {
+  if ("hole_diameter" in element && typeof element.hole_diameter === "number") {
+    return true;
+  }
+  return "hole_width" in element && typeof element.hole_width === "number" && "hole_height" in element && typeof element.hole_height === "number";
+};
+var convertSoupToExcellonDrillCommandLayers = ({
+  circuitJson,
+  flip_y_axis = false
+}) => {
+  const layerCount = getLayerCount(circuitJson);
+  const platedSpans = new Map(
+    circuitJson.flatMap((element) => {
+      const span = getPlatedElementLayerSpan(element, layerCount);
+      if (!span) {
+        return [];
+      }
+      return [[getDrillLayerSpanKey(span, layerCount), span]];
+    })
+  );
+  const platedDrillLayers = Object.fromEntries(
+    [...platedSpans.entries()].sort().map(([spanKey, span]) => [
+      `drill-${spanKey}.drl`,
+      convertSoupToExcellonDrillCommands({
+        circuitJson,
+        is_plated: true,
+        flip_y_axis,
+        layer_span: span
+      })
+    ])
+  );
+  const hasNonPlatedDrill = circuitJson.some((element) => {
+    if (element.type !== "pcb_hole") {
+      return false;
+    }
+    return hasDrillGeometry(element);
+  });
+  if (!hasNonPlatedDrill) {
+    return platedDrillLayers;
+  }
+  return {
+    ...platedDrillLayers,
+    "drill_npth.drl": convertSoupToExcellonDrillCommands({
+      circuitJson,
+      is_plated: false,
+      flip_y_axis
+    })
+  };
+};
 
 // src/gerber/commands/add_attribute_on_aperture.ts
 import { z as z21 } from "zod";
@@ -1445,7 +1614,7 @@ var findApertureNumber = (glayer, search_params) => {
 // package.json
 var package_default = {
   name: "circuit-json-to-gerber",
-  version: "0.0.54",
+  version: "0.0.55",
   main: "dist/index.js",
   type: "module",
   scripts: {
@@ -1583,7 +1752,7 @@ import {
   rotate,
   translate
 } from "transformation-matrix";
-var getLayerCount = (circuitJson) => {
+var getLayerCount2 = (circuitJson) => {
   const board = circuitJson.find((element) => element.type === "pcb_board");
   const numLayers = board?.num_layers ?? 2;
   return Math.max(2, Math.min(8, numLayers));
@@ -1598,7 +1767,7 @@ var getGerberInnerLayerName = (layerRef) => {
 var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
   opts.flip_y_axis ??= false;
   const hasPanel = circuitJson.some((e) => e.type === "pcb_panel");
-  const layerCount = getLayerCount(circuitJson);
+  const layerCount = getLayerCount2(circuitJson);
   const innerLayerRefs = getInnerLayerRefs(layerCount);
   const copperLayerRefs = ["top", ...innerLayerRefs, "bottom"];
   const outerLayerRefs = ["top", "bottom"];
@@ -2524,10 +2693,11 @@ export {
   stringifyExcellonDrill,
   excellonDrill,
   convertSoupToExcellonDrillCommands,
+  convertSoupToExcellonDrillCommandLayers,
   gerberBuilder,
   stringifyGerberCommand,
   stringifyGerberCommandLayers,
   stringifyGerberCommands,
   convertSoupToGerberCommands
 };
-//# sourceMappingURL=chunk-64R4GN2C.js.map
+//# sourceMappingURL=chunk-6BPSJ3NY.js.map