altium-to-circuit-json 0.0.49 → 0.0.51

package/dist/index.js

@@ -1381,7 +1381,7 @@ function addComponentFallbackText({
 
 // lib/schematic/components/convertComponent.ts
 import {
-  AltiumSchLabelRecord as AltiumSchLabelRecord4,
+  AltiumSchLabelRecord,
   AltiumSchPinRecord as AltiumSchPinRecord2
 } from "altiumts";
 
@@ -1496,12 +1496,19 @@ function uniqueStrings(strings) {
 
 // lib/schematic/connectivity/getEquivalentPortPrunedSegmentKeys.ts
 import {
-  AltiumSchLabelRecord,
+  AltiumSchPortRecord as AltiumSchPortRecord2,
+  getSchematicRecordPoints as getSchematicRecordPoints3
+} from "altiumts";
+
+// lib/schematic/netLabels/isElectricalLabelRecord.ts
+import {
   AltiumSchNetLabelRecord,
   AltiumSchPortRecord,
-  AltiumSchPowerPortRecord,
-  getSchematicRecordPoints as getSchematicRecordPoints3
+  AltiumSchPowerPortRecord
 } from "altiumts";
+function isElectricalLabelRecord(record) {
+  return record instanceof AltiumSchNetLabelRecord || record instanceof AltiumSchPortRecord || record instanceof AltiumSchPowerPortRecord;
+}
 
 // lib/schematic/connectivity/constants.ts
 var DIRECTION_BY_ORIENTATION = [
@@ -1648,10 +1655,8 @@ function getEquivalentPortPrunedSegmentKeys({
     convertedPorts.filter((port) => port.isSchematicVisible).map((port) => pointKey(port.point))
   );
   for (const record of net.records) {
-    if (!(record instanceof AltiumSchLabelRecord) && !(record instanceof AltiumSchNetLabelRecord) && !(record instanceof AltiumSchPortRecord) && !(record instanceof AltiumSchPowerPortRecord)) {
-      continue;
-    }
-    const location = record instanceof AltiumSchPortRecord ? getPortConnectionGeometry(record, wireSegments)?.anchor : getLocation(record);
+    if (!isElectricalLabelRecord(record)) continue;
+    const location = record instanceof AltiumSchPortRecord2 ? getPortConnectionGeometry(record, wireSegments)?.anchor : getLocation(record);
     if (location) protectedPointKeys.add(pointKey(location));
   }
   const segments = /* @__PURE__ */ new Map();
@@ -1810,19 +1815,15 @@ function createConnectedWiresByRecord(groupedByRoot) {
   return connectedWiresByRecord;
 }
 
+// lib/schematic/netLabels/getElectricalLabelName.ts
+import { AltiumSchPortRecord as AltiumSchPortRecord3 } from "altiumts";
+function getElectricalLabelName(record) {
+  return record instanceof AltiumSchPortRecord3 ? record.name : record.text;
+}
+
 // lib/schematic/connectivity/getElectricalRecordName.ts
-import {
-  AltiumSchLabelRecord as AltiumSchLabelRecord2,
-  AltiumSchNetLabelRecord as AltiumSchNetLabelRecord2,
-  AltiumSchPortRecord as AltiumSchPortRecord2,
-  AltiumSchPowerPortRecord as AltiumSchPowerPortRecord2
-} from "altiumts";
 function getElectricalRecordName(record) {
-  if (record instanceof AltiumSchPortRecord2) return record.name;
-  if (record instanceof AltiumSchLabelRecord2) return record.text;
-  if (record instanceof AltiumSchNetLabelRecord2) return record.text;
-  if (record instanceof AltiumSchPowerPortRecord2) return record.text;
-  return void 0;
+  return isElectricalLabelRecord(record) ? getElectricalLabelName(record) : void 0;
 }
 
 // lib/schematic/connectivity/getOrCreateSemanticNetGroup.ts
@@ -1847,17 +1848,14 @@ function getOrCreateSemanticNetGroup({
 // lib/schematic/connectivity/getPositionedElectricalRecords.ts
 import {
   AltiumSchJunctionRecord,
-  AltiumSchLabelRecord as AltiumSchLabelRecord3,
-  AltiumSchNetLabelRecord as AltiumSchNetLabelRecord3,
-  AltiumSchPortRecord as AltiumSchPortRecord3,
-  AltiumSchPowerPortRecord as AltiumSchPowerPortRecord3
+  AltiumSchPortRecord as AltiumSchPortRecord4
 } from "altiumts";
 function getPositionedElectricalRecords(document, segments) {
   return document.records.flatMap((record) => {
-    if (!(record instanceof AltiumSchLabelRecord3) && !(record instanceof AltiumSchNetLabelRecord3) && !(record instanceof AltiumSchPortRecord3) && !(record instanceof AltiumSchPowerPortRecord3) && !(record instanceof AltiumSchJunctionRecord)) {
+    if (!isElectricalLabelRecord(record) && !(record instanceof AltiumSchJunctionRecord)) {
       return [];
     }
-    const point = record instanceof AltiumSchPortRecord3 ? getPortConnectionGeometry(record, segments)?.anchor : getLocation(record);
+    const point = record instanceof AltiumSchPortRecord4 ? getPortConnectionGeometry(record, segments)?.anchor : getLocation(record);
     return point ? [{ point, record }] : [];
   });
 }
@@ -2786,7 +2784,7 @@ function convertComponent({
   if (pins.length === 0) return;
   const visibleSymbolLabels = new Set(
     visibleOwnedRecords.filter(
-      (record) => record instanceof AltiumSchLabelRecord4
+      (record) => record instanceof AltiumSchLabelRecord
     ).flatMap((record) => {
       const text = record.text?.trim().toUpperCase();
       return text ? [text] : [];
@@ -2911,20 +2909,19 @@ var INLINE_NET_LABEL_HORIZONTAL_PADDING = 0.12;
 
 // lib/schematic/netLabels/convertNetLabels.ts
 import {
-  AltiumSchLabelRecord as AltiumSchLabelRecord6,
-  AltiumSchNetLabelRecord as AltiumSchNetLabelRecord5,
-  AltiumSchPortRecord as AltiumSchPortRecord8,
-  AltiumSchPowerPortRecord as AltiumSchPowerPortRecord5
+  AltiumSchNetLabelRecord as AltiumSchNetLabelRecord2,
+  AltiumSchPortRecord as AltiumSchPortRecord7,
+  AltiumSchPowerPortRecord as AltiumSchPowerPortRecord2
 } from "altiumts";
 
 // lib/schematic/netLabels/createInlineNetLabelText.ts
 import {
-  AltiumSchPortRecord as AltiumSchPortRecord5
+  AltiumSchPortRecord as AltiumSchPortRecord6
 } from "altiumts";
 
 // lib/schematic/netLabels/getInlineNetLabelDirection.ts
 import {
-  AltiumSchPortRecord as AltiumSchPortRecord4,
+  AltiumSchPortRecord as AltiumSchPortRecord5,
   getSchematicRecordPoints as getSchematicRecordPoints7
 } from "altiumts";
 function getInlineNetLabelDirection({
@@ -2932,7 +2929,7 @@ function getInlineNetLabelDirection({
   location,
   connectedWires
 }) {
-  if (!(record instanceof AltiumSchPortRecord4)) {
+  if (!(record instanceof AltiumSchPortRecord5)) {
     return getRecordDirection(record);
   }
   for (const wire of connectedWires) {
@@ -3008,7 +3005,7 @@ function createInlineNetLabelText({
   const textWidth = (name.length * INLINE_NET_LABEL_CHARACTER_WIDTH + INLINE_NET_LABEL_HORIZONTAL_PADDING) * fontSizeRatio;
   const isVertical = direction === "up" || direction === "down";
   const directionSign = direction === "left" || direction === "down" ? -1 : 1;
-  const isTerminalPort = record instanceof AltiumSchPortRecord5;
+  const isTerminalPort = record instanceof AltiumSchPortRecord6;
   const anchor = isTerminalPort ? directionSign > 0 ? "left" : "right" : "center";
   const position = isTerminalPort ? isVertical ? {
     x: scaledLocation.x - fontSize / 2,
@@ -3037,12 +3034,6 @@ function createInlineNetLabelText({
   };
 }
 
-// lib/schematic/netLabels/getElectricalLabelName.ts
-import { AltiumSchPortRecord as AltiumSchPortRecord6 } from "altiumts";
-function getElectricalLabelName(record) {
-  return record instanceof AltiumSchPortRecord6 ? record.name : record.text;
-}
-
 // lib/schematic/netLabels/getPowerPortSymbolName.ts
 function getPowerPortSymbolName(record, direction) {
   const style = Math.round(record.getNumber("STYLE") ?? 2);
@@ -3051,17 +3042,6 @@ function getPowerPortSymbolName(record, direction) {
   return `vcc_${direction}`;
 }
 
-// lib/schematic/netLabels/isElectricalLabelRecord.ts
-import {
-  AltiumSchLabelRecord as AltiumSchLabelRecord5,
-  AltiumSchNetLabelRecord as AltiumSchNetLabelRecord4,
-  AltiumSchPortRecord as AltiumSchPortRecord7,
-  AltiumSchPowerPortRecord as AltiumSchPowerPortRecord4
-} from "altiumts";
-function isElectricalLabelRecord(record) {
-  return record instanceof AltiumSchLabelRecord5 || record instanceof AltiumSchNetLabelRecord4 || record instanceof AltiumSchPortRecord7 || record instanceof AltiumSchPowerPortRecord4;
-}
-
 // lib/schematic/netLabels/convertNetLabels.ts
 function convertNetLabels({
   connectivity,
@@ -3079,14 +3059,13 @@ function convertNetLabels({
       continue;
     }
     const name = getElectricalLabelName(record);
-    const portConnection = record instanceof AltiumSchPortRecord8 ? getPortConnectionGeometry(record, allWireSegments) : void 0;
+    const portConnection = record instanceof AltiumSchPortRecord7 ? getPortConnectionGeometry(record, allWireSegments) : void 0;
     const location = portConnection?.anchor ?? getLocation(record);
     if (!name || !location) continue;
     const connectedWires = graph.getConnectedWiresForRecord(record);
     const wire = connectedWires[0];
-    if (record instanceof AltiumSchLabelRecord6 && !wire) continue;
     const sourceTraceId = connectivity.sourceTraceIdByRecord.get(record);
-    const shouldRenderInline = Boolean(sourceTraceId) && (record instanceof AltiumSchNetLabelRecord5 || record instanceof AltiumSchPortRecord8 && (record.getNumber("IOTYPE") ?? 0) === 0 && connectivity.sourcePortCountByRecord.get(record) === 2 && !isPowerNet(name));
+    const shouldRenderInline = Boolean(sourceTraceId) && (record instanceof AltiumSchNetLabelRecord2 || record instanceof AltiumSchPortRecord7 && (record.getNumber("IOTYPE") ?? 0) === 0 && connectivity.sourcePortCountByRecord.get(record) === 2 && !isPowerNet(name));
     if (shouldRenderInline && sourceTraceId) {
       handledRecords.add(record);
       elements.push(
@@ -3111,7 +3090,7 @@ function convertNetLabels({
     });
     const schematicTraceId = wire ? connectivity.schematicTraceIdByRecord.get(wire) : void 0;
     const direction = getRecordDirection(record);
-    const symbolName = record instanceof AltiumSchPowerPortRecord5 ? getPowerPortSymbolName(record, direction) : void 0;
+    const symbolName = record instanceof AltiumSchPowerPortRecord2 ? getPowerPortSymbolName(record, direction) : void 0;
     const schematicNetLabel = {
       type: "schematic_net_label",
       anchor_position: scalePoint(location, options.scale),
@@ -4878,7 +4857,7 @@ function mapTextAnchor(justification) {
   if (normalizedJustification?.includes("CENTER")) return "bottom_center";
   if (normalizedJustification?.includes("RIGHT")) return "bottom_right";
   if (normalizedJustification?.includes("LEFT")) return "bottom_left";
-  return "center";
+  return "bottom_left";
 }
 
 // lib/pcb/text/convertPcbCopperText.ts