altium-to-circuit-json 0.0.39 → 0.0.41

package/dist/index.js

@@ -47,7 +47,9 @@ function mapAltiumCopperLayer(layer) {
 
 // lib/pcb/convert-altium-copper-areas.ts
 var MILS_TO_MILLIMETERS = 0.0254;
-function convertAltiumCopperAreas(document) {
+function convertAltiumCopperAreas(document, {
+  getSourceNetId = () => void 0
+} = {}) {
   const polygonIndexesWithRegions = new Set(
     document.records.flatMap((record) => {
       if (!(record instanceof AltiumRegionRecord) || record.recordKind !== "Region") {
@@ -62,24 +64,37 @@ function convertAltiumCopperAreas(document) {
   );
   return document.records.flatMap((record, recordIndex) => {
     if (record instanceof AltiumRegionRecord) {
-      return convertCopperRegion({ record, recordIndex });
+      return convertCopperRegion({
+        record,
+        recordIndex,
+        sourceNetId: getSourceNetId(record)
+      });
     }
     if (record instanceof AltiumPolygonRecord) {
       const polygonIndex = polygonIndexes.get(record);
       if (record.shelved === true || polygonIndex === void 0 || polygonIndexesWithRegions.has(polygonIndex)) {
         return [];
       }
-      return convertCopperPolygon({ polygonIndex, record });
+      return convertCopperPolygon({
+        polygonIndex,
+        record,
+        sourceNetId: getSourceNetId(record)
+      });
     }
     if (record instanceof AltiumFillRecord) {
-      return convertCopperFill({ record, recordIndex });
+      return convertCopperFill({
+        record,
+        recordIndex,
+        sourceNetId: getSourceNetId(record)
+      });
     }
     return [];
   });
 }
 function convertCopperRegion({
   record,
-  recordIndex
+  recordIndex,
+  sourceNetId
 }) {
   if (record.recordKind !== "Region" || record.regionKind !== "COPPER") {
     return [];
@@ -95,6 +110,7 @@ function convertCopperRegion({
       {
         type: "pcb_copper_pour",
         pcb_copper_pour_id: `pcb_copper_pour_altium_region_${recordIndex}`,
+        ...sourceNetId ? { source_net_id: sourceNetId } : {},
         covered_with_solder_mask: true,
         layer,
         shape: "polygon",
@@ -106,6 +122,7 @@ function convertCopperRegion({
     {
       type: "pcb_copper_pour",
       pcb_copper_pour_id: `pcb_copper_pour_altium_region_${recordIndex}`,
+      ...sourceNetId ? { source_net_id: sourceNetId } : {},
       covered_with_solder_mask: true,
       layer,
       shape: "brep",
@@ -118,7 +135,8 @@ function convertCopperRegion({
 }
 function convertCopperPolygon({
   polygonIndex,
-  record
+  record,
+  sourceNetId
 }) {
   const layer = mapAltiumCopperLayer(record.layer);
   if (!layer) return [];
@@ -128,6 +146,7 @@ function convertCopperPolygon({
     {
       type: "pcb_copper_pour",
       pcb_copper_pour_id: `pcb_copper_pour_altium_polygon_${polygonIndex}`,
+      ...sourceNetId ? { source_net_id: sourceNetId } : {},
       covered_with_solder_mask: true,
       layer,
       shape: "polygon",
@@ -137,7 +156,8 @@ function convertCopperPolygon({
 }
 function convertCopperFill({
   record,
-  recordIndex
+  recordIndex,
+  sourceNetId
 }) {
   const layer = mapAltiumCopperLayer(record.layer);
   if (!layer || !record.bounds) return [];
@@ -148,6 +168,7 @@ function convertCopperFill({
     {
       type: "pcb_copper_pour",
       pcb_copper_pour_id: `pcb_copper_pour_altium_fill_${recordIndex}`,
+      ...sourceNetId ? { source_net_id: sourceNetId } : {},
       covered_with_solder_mask: true,
       layer,
       shape: "rect",
@@ -463,6 +484,8 @@ var ALTIUM_TEXT_ANCHORS = [
 ];
 function convertAltiumPcbDocToCircuitJson(document, options = {}) {
   const elements = [];
+  const netContext = createPcbNetContext(document);
+  elements.push(...netContext.elements);
   if (options.includeBoardOutline !== false) {
     elements.push(createBoard(document));
     for (const [index, cutout] of document.boardGeometry.cutouts.entries()) {
@@ -503,7 +526,11 @@ function convertAltiumPcbDocToCircuitJson(document, options = {}) {
     elements.push(...convertCourtyards(document));
   }
   if (options.includeCopperAreas !== false) {
-    elements.push(...convertAltiumCopperAreas(document));
+    elements.push(
+      ...convertAltiumCopperAreas(document, {
+        getSourceNetId: netContext.getSourceNetId
+      })
+    );
   }
   for (const [index, record] of document.records.entries()) {
     if (record instanceof AltiumArcRecord2 && isKeepoutLayer2(record.layer) && options.includeKeepouts !== false) {
@@ -537,13 +564,13 @@ function convertAltiumPcbDocToCircuitJson(document, options = {}) {
         const line = convertSilkscreenLine(record, index);
         if (line) elements.push(line);
       } else if (options.includeTraces !== false) {
-        const trace = convertTrack(record, index);
+        const trace = convertTrack(record, index, netContext);
         if (trace) elements.push(trace);
       }
       continue;
     }
     if (record instanceof AltiumViaRecord2 && options.includeVias !== false) {
-      const via = convertVia(record, index);
+      const via = convertVia(record, index, netContext);
       if (via) elements.push(via);
       continue;
     }
@@ -554,7 +581,7 @@ function convertAltiumPcbDocToCircuitJson(document, options = {}) {
         const path = convertSilkscreenArc(record, index);
         if (path) elements.push(path);
       } else if (options.includeTraces !== false) {
-        const trace = convertArcTrack(record, index);
+        const trace = convertArcTrack(record, index, netContext);
         if (trace) elements.push(trace);
       }
       continue;
@@ -684,7 +711,10 @@ function convertDimension(record, index) {
 }
 function getDimensionText(record, measuredDistanceMils) {
   const explicitText = record.getDecoded("TEXTFORMAT")?.trim();
-  if (explicitText && explicitText !== "<>") return explicitText;
+  const isMeasurementShapedFormat = explicitText !== void 0 && parseAltiumMeasurementToMils2(explicitText) !== void 0;
+  if (explicitText && explicitText !== "<>" && !isMeasurementShapedFormat) {
+    return explicitText;
+  }
   const precision = Math.min(Math.max(record.precision ?? 2, 0), 6);
   const normalizedUnit = record.unit?.toUpperCase() ?? "MILS";
   let amount = measuredDistanceMils;
@@ -852,15 +882,61 @@ function getFallbackPcbBounds(records) {
   }
   return getAltiumBounds2(points) ?? { minX: 0, minY: 0, maxX: 1e3, maxY: 800 };
 }
-function convertTrack(record, index) {
+function createPcbNetContext(document) {
+  const sourceNetIdByAltiumNet = new Map(
+    document.nets.map((net, index) => [net, `source_net_altium_pcb_${index}`])
+  );
+  const sourceTraceIdByAltiumNet = new Map(
+    document.nets.map((net, index) => [
+      net,
+      `source_trace_altium_pcb_${index}`
+    ])
+  );
+  const elements = document.nets.flatMap((net, index) => {
+    const name = net.name?.trim() || `Net ${index + 1}`;
+    const sourceNetId = sourceNetIdByAltiumNet.get(net);
+    const sourceTraceId = sourceTraceIdByAltiumNet.get(net);
+    if (!sourceNetId || !sourceTraceId) return [];
+    return [
+      {
+        type: "source_net",
+        source_net_id: sourceNetId,
+        name,
+        member_source_group_ids: []
+      },
+      {
+        type: "source_trace",
+        source_trace_id: sourceTraceId,
+        connected_source_port_ids: [],
+        connected_source_net_ids: [sourceNetId],
+        name,
+        display_name: name
+      }
+    ];
+  });
+  return {
+    elements,
+    getSourceNetId: (record) => {
+      const net = document.getNetForRecord(record);
+      return net ? sourceNetIdByAltiumNet.get(net) : void 0;
+    },
+    getSourceTraceId: (record) => {
+      const net = document.getNetForRecord(record);
+      return net ? sourceTraceIdByAltiumNet.get(net) : void 0;
+    }
+  };
+}
+function convertTrack(record, index, netContext) {
   const start = record.start;
   const end = record.end;
   const layer = mapAltiumCopperLayer(record.layer);
   if (!start || !end || !layer) return void 0;
   const width = milsToMillimeters2(record.widthMils ?? 4);
+  const sourceTraceId = netContext.getSourceTraceId(record);
   return {
     type: "pcb_trace",
     pcb_trace_id: `pcb_trace_altium_${index}`,
+    ...sourceTraceId ? { source_trace_id: sourceTraceId } : {},
     should_round_corners: true,
     route: [
       { route_type: "wire", ...toMillimeterPoint(start), width, layer },
@@ -868,7 +944,7 @@ function convertTrack(record, index) {
     ]
   };
 }
-function convertArcTrack(record, index) {
+function convertArcTrack(record, index, netContext) {
   if (!record.center || !record.radiusMils) return void 0;
   const layer = mapAltiumCopperLayer(record.layer);
   if (!layer) return void 0;
@@ -879,9 +955,11 @@ function convertArcTrack(record, index) {
     startAngle: record.startAngle,
     endAngle: record.endAngle
   });
+  const sourceTraceId = netContext.getSourceTraceId(record);
   return {
     type: "pcb_trace",
     pcb_trace_id: `pcb_trace_altium_arc_${index}`,
+    ...sourceTraceId ? { source_trace_id: sourceTraceId } : {},
     should_round_corners: true,
     route: points.map((point) => ({
       route_type: "wire",
@@ -910,15 +988,19 @@ function convertCopperText(record, index) {
     is_mirrored: record.mirrored
   };
 }
-function convertVia(record, index) {
+function convertVia(record, index, netContext) {
   if (!record.position) return void 0;
   const startLayer = mapAltiumCopperLayer(record.startLayer) ?? "top";
   const endLayer = mapAltiumCopperLayer(record.endLayer) ?? "bottom";
   const layers = startLayer === endLayer ? [startLayer] : [startLayer, endLayer];
   const outerDiameter = milsToMillimeters2(record.diameterMils ?? 20);
+  const sourceNetId = netContext.getSourceNetId(record);
+  const sourceTraceId = netContext.getSourceTraceId(record);
   return {
     type: "pcb_via",
     pcb_via_id: `pcb_via_altium_${index}`,
+    ...sourceNetId ? { source_net_id: sourceNetId } : {},
+    ...sourceTraceId ? { source_trace_id: sourceTraceId } : {},
     ...toMillimeterPoint(record.position),
     outer_diameter: outerDiameter,
     hole_diameter: milsToMillimeters2(