altium-to-circuit-json 0.0.52 → 0.0.53

package/dist/index.js

@@ -318,39 +318,22 @@ function getBoundsForPoints(points) {
   };
 }
 
-// lib/schematic/geometry/getCoordinate.ts
-function getCoordinate(record, key) {
-  const raw = record.getCaseInsensitive(key);
-  if (raw === void 0) return void 0;
-  const integer = Number(raw);
-  if (!Number.isFinite(integer)) return void 0;
-  const fractionRaw = record.getCaseInsensitive(`${key}_FRAC`);
-  if (fractionRaw === void 0) return integer;
-  const fraction = Number(`0.${fractionRaw.replace(/^[+-]/u, "")}`);
-  if (!Number.isFinite(fraction)) return integer;
-  return integer < 0 ? integer - fraction : integer + fraction;
-}
-
 // lib/schematic/geometry/getCoordinateOrFallback.ts
+import { getSchematicCoordinate } from "altiumts";
 function getCoordinateOrFallback({
   record,
   key,
   fallback
 }) {
-  const rawInteger = record.getCaseInsensitive(key);
-  if (rawInteger !== void 0) return getCoordinate(record, key) ?? fallback;
-  const rawFraction = record.getCaseInsensitive(`${key}_FRAC`);
-  if (rawFraction === void 0) return fallback;
-  const fraction = Number(`0.${rawFraction.replace(/^[+-]/u, "")}`);
-  if (!Number.isFinite(fraction)) return fallback;
-  return fallback < 0 ? fallback - fraction : fallback + fraction;
+  return getSchematicCoordinate(record, key, fallback);
 }
 
 // lib/schematic/geometry/getCorner.ts
+import {
+  getSchematicPoint
+} from "altiumts";
 function getCorner(record) {
-  const x = getCoordinate(record, "CORNER.X");
-  const y = getCoordinate(record, "CORNER.Y");
-  return x === void 0 || y === void 0 ? void 0 : { x, y };
+  return getSchematicPoint(record, { xKey: "CORNER.X", yKey: "CORNER.Y" });
 }
 
 // lib/schematic/geometry/getDirectionForVector.ts
@@ -362,10 +345,11 @@ function getDirectionForVector(vector) {
 }
 
 // lib/schematic/geometry/getLocation.ts
+import {
+  getSchematicPoint as getSchematicPoint2
+} from "altiumts";
 function getLocation(record) {
-  const x = getCoordinate(record, "LOCATION.X");
-  const y = getCoordinate(record, "LOCATION.Y");
-  return x === void 0 || y === void 0 ? void 0 : { x, y };
+  return getSchematicPoint2(record, { xKey: "LOCATION.X", yKey: "LOCATION.Y" });
 }
 
 // lib/schematic/geometry/getPointDistance.ts
@@ -805,8 +789,14 @@ function renderHierarchicalPort({
 }) {
   const location = getLocation(record);
   if (!location) return [];
-  const width = Math.max(Number(record.getCaseInsensitive("WIDTH") ?? 16), 10);
-  const height = Math.max(Number(record.getCaseInsensitive("HEIGHT") ?? 10), 4);
+  const width = Math.max(
+    getCoordinateOrFallback({ record, key: "WIDTH", fallback: 16 }),
+    10
+  );
+  const height = Math.max(
+    getCoordinateOrFallback({ record, key: "HEIGHT", fallback: 10 }),
+    4
+  );
   const halfHeight = height / 2;
   const pointDepth = Math.min(width * 0.22, height);
   const ioType = Number(record.getCaseInsensitive("IOTYPE") ?? 0);
@@ -889,7 +879,7 @@ function renderPin({
     { x: 0, y: -1 }
   ][orientation] ?? { x: 1, y: 0 };
   const length = Math.max(
-    Number(record.getCaseInsensitive("PINLENGTH") ?? 10),
+    getCoordinateOrFallback({ record, key: "PINLENGTH", fallback: 10 }),
     1
   );
   const end = {
@@ -1782,7 +1772,10 @@ function getPortConnectionGeometry(record, wireSegments) {
   if (!origin) return void 0;
   const originToExtremity = getRecordDirection(record);
   const directionVector = VECTOR_BY_DIRECTION[originToExtremity];
-  const width = Math.max(record.getNumber("WIDTH") ?? 16, 0);
+  const width = Math.max(
+    getCoordinateOrFallback({ record, key: "WIDTH", fallback: 16 }),
+    0
+  );
   const extremity = {
     x: origin.x + directionVector.x * width,
     y: origin.y + directionVector.y * width
@@ -2895,8 +2888,16 @@ function getComponentBodyBounds(records, portPoints) {
     if (location && corner) points.push(location, corner);
     points.push(...getSchematicRecordPoints6(record));
     if (record instanceof AltiumSchEllipseRecord && location) {
-      const radiusX = Math.abs(record.getNumber("RADIUS") ?? 0);
-      const radiusY = Math.abs(record.getNumber("SECONDARYRADIUS") ?? radiusX);
+      const radiusX = Math.abs(
+        getCoordinateOrFallback({ record, key: "RADIUS", fallback: 0 })
+      );
+      const radiusY = Math.abs(
+        getCoordinateOrFallback({
+          record,
+          key: "SECONDARYRADIUS",
+          fallback: radiusX
+        })
+      );
       points.push(
         { x: location.x - radiusX, y: location.y - radiusY },
         { x: location.x + radiusX, y: location.y + radiusY }