altium-to-circuit-json 0.0.41 → 0.0.43

package/dist/index.js

@@ -729,7 +729,8 @@ function getDimensionText(record, measuredDistanceMils) {
     amount /= 1e3;
     unitLabel = "in";
   }
-  return `${record.prefix ?? ""}${amount.toFixed(precision)}${record.suffix ?? ` ${unitLabel}`}`;
+  const suffix = record.suffix?.trim() ? record.suffix : ` ${unitLabel}`;
+  return `${record.prefix ?? ""}${amount.toFixed(precision)}${suffix}`;
 }
 function mapMechanicalLayer(layer) {
   return normalizeLayer2(layer).includes("BOTTOM") ? "bottom" : "top";
@@ -849,12 +850,7 @@ function createBoard(document) {
   const bounds = getAltiumBounds2(altiumOutline) ?? getFallbackPcbBounds(document.records);
   const width = Math.max(milsToMillimeters2(bounds.maxX - bounds.minX), 0.1);
   const height = Math.max(milsToMillimeters2(bounds.maxY - bounds.minY), 0.1);
-  const numLayers = document.board ? Math.max(
-    getPcbLayerStack(document.board).entries.filter(
-      (entry) => Boolean(mapAltiumCopperLayer(entry.name ?? entry.layerId))
-    ).length,
-    2
-  ) : 2;
+  const numLayers = getBoardLayerCount(document);
   return {
     type: "pcb_board",
     pcb_board_id: BOARD_ID,
@@ -870,6 +866,22 @@ function createBoard(document) {
     material: "fr4"
   };
 }
+function getBoardLayerCount(document) {
+  if (!document.board) return 2;
+  const entries = getPcbLayerStack(document.board).entries;
+  const modernCopperLayerCount = entries.filter(
+    (entry) => entry.source === "v8" && entry.copperThickness !== void 0
+  ).length;
+  if (modernCopperLayerCount > 0) {
+    return Math.max(modernCopperLayerCount, 2);
+  }
+  return Math.max(
+    entries.filter(
+      (entry) => Boolean(mapAltiumCopperLayer(entry.name ?? entry.layerId))
+    ).length,
+    2
+  );
+}
 function getFallbackPcbBounds(records) {
   const points = [];
   for (const record of records) {