circuit-json-to-gerber 0.0.76 → 0.0.78

package/dist/{chunk-ER5XAENM.js → chunk-O4SBQLXH.js}

@@ -402,9 +402,11 @@ var getTraceRouteViaElements = (circuitJson) => {
       continue;
     }
     for (const [index, point] of element.route.entries()) {
-      if (point.route_type !== "via" || typeof point.hole_diameter !== "number" || typeof point.outer_diameter !== "number") {
+      if (point.route_type !== "via" || typeof point.hole_diameter !== "number" || typeof point.outer_diameter !== "number" || typeof point.from_layer !== "string" || typeof point.to_layer !== "string") {
         continue;
       }
+      const fromLayer = point.from_layer;
+      const toLayer = point.to_layer;
       routeVias.push({
         type: "pcb_via",
         pcb_via_id: `${element.pcb_trace_id}_route_via_${index}`,
@@ -412,9 +414,9 @@ var getTraceRouteViaElements = (circuitJson) => {
         y: point.y,
         hole_diameter: point.hole_diameter,
         outer_diameter: point.outer_diameter,
-        from_layer: point.from_layer,
-        to_layer: point.to_layer,
-        layers: [point.from_layer, point.to_layer]
+        from_layer: fromLayer,
+        to_layer: toLayer,
+        layers: [fromLayer, toLayer]
       });
     }
   }
@@ -464,6 +466,9 @@ var convertSoupToExcellonDrillCommands = ({
     })) {
       continue;
     }
+    if (is_plated && element.type === "pcb_hole") {
+      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;
     if (!holeDiameter) continue;
     if (!diameterToToolNumber[holeDiameter]) {
@@ -493,6 +498,9 @@ var convertSoupToExcellonDrillCommands = ({
         })) {
           continue;
         }
+        if (is_plated && element.type === "pcb_hole") {
+          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;
         if (!holeDiameter || diameterToToolNumber[holeDiameter] !== i) {
           continue;
@@ -1814,6 +1822,7 @@ function getAllApertureTemplateConfigsForLayer({
         }
       }
     } else if (elm.type === "pcb_hole") {
+      if (!isSoldermaskLayer) continue;
       if (glayer_name.endsWith("_Mask") && elm.is_covered_with_solder_mask === true) {
         continue;
       }
@@ -1892,7 +1901,7 @@ var findApertureNumber = (glayer, search_params) => {
 // package.json
 var package_default = {
   name: "circuit-json-to-gerber",
-  version: "0.0.75",
+  version: "0.0.77",
   main: "dist/index.js",
   type: "module",
   scripts: {
@@ -2365,7 +2374,7 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
     }
     const transformMatrix = transforms.length > 0 ? compose(...transforms) : void 0;
     const applyTransform = (point) => transformMatrix ? applyToPoint(transformMatrix, point) : point;
-    if (layerType === "copper" && element.is_knockout) {
+    if (element.is_knockout) {
       const padding = element.knockout_padding ?? {
         left: 0.2,
         right: 0.2,
@@ -2430,7 +2439,7 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
       anchoredX += fontSize + letterSpacing;
     }
     glayer.push(...gerber.build());
-    if (layerType === "copper" && element.is_knockout) {
+    if (element.is_knockout) {
       glayer.push(
         ...gerberBuilder().add("set_layer_polarity", { polarity: "D" }).build()
       );
@@ -3225,4 +3234,4 @@ export {
   stringifyGerberCommands,
   convertSoupToGerberCommands
 };
-//# sourceMappingURL=chunk-ER5XAENM.js.map
+//# sourceMappingURL=chunk-O4SBQLXH.js.map