altium-to-circuit-json 0.0.68 → 0.0.69

package/dist/index.js

@@ -1641,10 +1641,7 @@ function addComponentFallbackText({
 }
 
 // lib/schematic/components/convertComponent.ts
-import {
-  AltiumSchLabelRecord,
-  AltiumSchPinRecord as AltiumSchPinRecord3
-} from "altiumts";
+import { AltiumSchPinRecord as AltiumSchPinRecord3 } from "altiumts";
 
 // lib/schematic/symbols/applyNativeSymbolPortGeometry.ts
 import { applyToPoint as applyToPoint6, translate as translate2 } from "transformation-matrix";
@@ -2842,6 +2839,47 @@ function convertComponentPin({
   };
 }
 
+// lib/schematic/rendering/convertSchematicArcToPath.ts
+import {
+  applyToPoint as applyToPoint7,
+  compose as compose2,
+  rotateDEG as rotateDEG2,
+  translate as translate3
+} from "transformation-matrix";
+var MAXIMUM_ARC_STEP_DEGREES = 7.5;
+function convertSchematicArcToPath(schematicArc) {
+  const rawSpanDegrees = schematicArc.end_angle_degrees - schematicArc.start_angle_degrees;
+  const normalizedCounterclockwiseSpan = (rawSpanDegrees % 360 + 360) % 360;
+  const counterclockwiseSpanDegrees = normalizedCounterclockwiseSpan === 0 && rawSpanDegrees !== 0 ? 360 : normalizedCounterclockwiseSpan;
+  const signedSpanDegrees = schematicArc.direction === "clockwise" ? counterclockwiseSpanDegrees - 360 : counterclockwiseSpanDegrees;
+  const segmentCount = Math.max(
+    Math.ceil(Math.abs(signedSpanDegrees) / MAXIMUM_ARC_STEP_DEGREES),
+    1
+  );
+  const points = Array.from({ length: segmentCount + 1 }, (_, index) => {
+    const ccwRotationDegrees = schematicArc.start_angle_degrees + signedSpanDegrees * index / segmentCount;
+    const arcToSchematic = compose2(
+      translate3(schematicArc.center.x, schematicArc.center.y),
+      rotateDEG2(ccwRotationDegrees)
+    );
+    return applyToPoint7(arcToSchematic, { x: schematicArc.radius, y: 0 });
+  });
+  return {
+    type: "schematic_path",
+    schematic_path_id: schematicArc.schematic_arc_id.replace(
+      "schematic_arc_",
+      "schematic_path_"
+    ),
+    schematic_sheet_id: schematicArc.schematic_sheet_id,
+    schematic_component_id: schematicArc.schematic_component_id,
+    is_dashed: schematicArc.is_dashed,
+    is_filled: false,
+    points,
+    stroke_color: schematicArc.color,
+    stroke_width: schematicArc.stroke_width
+  };
+}
+
 // lib/schematic/components/convertOwnedComponentRecords.ts
 import {
   AltiumSchImageRecord as AltiumSchImageRecord2,
@@ -2882,6 +2920,42 @@ function convertOwnedComponentRecords({
   });
 }
 
+// lib/schematic/components/convertOwnedLogicGateBody.ts
+function convertOwnedLogicGateBody({
+  identity,
+  pins,
+  records,
+  visibleSymbolLabels
+}, context) {
+  const logicGateLabels = /* @__PURE__ */ new Set([
+    ...visibleSymbolLabels,
+    ...pins.flatMap((pin) => {
+      const name = pin.getDecoded("NAME")?.trim().toUpperCase();
+      return name ? [name] : [];
+    })
+  ]);
+  if (!["A", "B", "Y"].every((label) => logicGateLabels.has(label))) {
+    return void 0;
+  }
+  const ownedElements = convertOwnedComponentRecords(
+    {
+      ownedRecords: records,
+      schematicComponentId: identity.schematicComponentId
+    },
+    context
+  );
+  if (!ownedElements.some((element) => element.type === "schematic_arc")) {
+    return void 0;
+  }
+  return ownedElements.map(
+    (element) => element.type === "schematic_arc" ? convertSchematicArcToPath(element) : element
+  ).sort((left, right) => {
+    const leftIsFilled = "is_filled" in left && left.is_filled === true ? 1 : 0;
+    const rightIsFilled = "is_filled" in right && right.is_filled === true ? 1 : 0;
+    return rightIsFilled - leftIsFilled;
+  });
+}
+
 // lib/schematic/components/getComponentBodyBounds.ts
 import {
   AltiumSchEllipseRecord,
@@ -3010,13 +3084,52 @@ function createAlphanumericPinDesignatorText({
   };
 }
 
-// lib/schematic/components/createPinClockSymbol.ts
+// lib/schematic/components/createNumericPinDesignatorText.ts
 var EDGE_VECTOR_BY_SIDE2 = {
   bottom: { x: 0, y: 1 },
   left: { x: 1, y: 0 },
   right: { x: -1, y: 0 },
   top: { x: 0, y: -1 }
 };
+function createNumericPinDesignatorText({
+  pin,
+  recordIndex,
+  scale: scale5,
+  schematicPort
+}) {
+  const designator = pin.designator;
+  if (!designator || parsePinNumber(designator) === void 0) return void 0;
+  const pinConglomerate = pin.pinConglomerate;
+  const isDesignatorVisible = pinConglomerate === void 0 || (pinConglomerate & 16) !== 0;
+  const side = schematicPort.side_of_component;
+  if (!isDesignatorVisible || !side) return void 0;
+  const edgeVector = EDGE_VECTOR_BY_SIDE2[side];
+  const halfPinLength = (schematicPort.distance_from_component_edge ?? 0.4) / 2;
+  const position = {
+    x: schematicPort.center.x + edgeVector.x * halfPinLength,
+    y: schematicPort.center.y + edgeVector.y * halfPinLength
+  };
+  return {
+    type: "schematic_text",
+    anchor: "bottom_center",
+    color: "#a90000",
+    font_size: Math.max(scaleLength(1.5, scale5), 0.15),
+    position,
+    rotation: side === "top" || side === "bottom" ? -90 : 0,
+    // Primitive component bodies render their text as sheet-level elements.
+    schematic_sheet_id: schematicPort.schematic_sheet_id,
+    schematic_text_id: `schematic_pin_designator_altium_${recordIndex}`,
+    text: designator
+  };
+}
+
+// lib/schematic/components/createPinClockSymbol.ts
+var EDGE_VECTOR_BY_SIDE3 = {
+  bottom: { x: 0, y: 1 },
+  left: { x: 1, y: 0 },
+  right: { x: -1, y: 0 },
+  top: { x: 0, y: -1 }
+};
 function createPinClockSymbol({
   pin,
   recordIndex,
@@ -3025,7 +3138,7 @@ function createPinClockSymbol({
 }) {
   const side = schematicPort.side_of_component;
   if (pin.getNumber("SYMBOL_INNEREDGE") !== 3 || !side) return void 0;
-  const edgeVector = EDGE_VECTOR_BY_SIDE2[side];
+  const edgeVector = EDGE_VECTOR_BY_SIDE3[side];
   const pinLength = schematicPort.distance_from_component_edge ?? 0.4;
   const bodyPosition = {
     x: schematicPort.center.x + edgeVector.x * pinLength,
@@ -3063,6 +3176,7 @@ function createPinClockSymbol({
 // lib/schematic/components/createComponentPinEdgeElements.ts
 function createComponentPinEdgeElements({
   componentPorts,
+  includeNumericDesignators,
   pins
 }, context) {
   return componentPorts.flatMap(
@@ -3078,6 +3192,7 @@ function createComponentPinEdgeElements({
       };
       return [
         createAlphanumericPinDesignatorText(edgeElementParameters),
+        includeNumericDesignators ? createNumericPinDesignatorText(edgeElementParameters) : void 0,
         createPinClockSymbol(edgeElementParameters)
       ].filter((element) => element !== void 0);
     }
@@ -3252,6 +3367,19 @@ function getComponentIdentity({
   };
 }
 
+// lib/schematic/components/getVisibleSymbolLabels.ts
+import { AltiumSchLabelRecord } from "altiumts";
+function getVisibleSymbolLabels(records) {
+  return new Set(
+    records.filter(
+      (record) => record instanceof AltiumSchLabelRecord
+    ).flatMap((record) => {
+      const text = record.text?.trim().toUpperCase();
+      return text ? [text] : [];
+    })
+  );
+}
+
 // lib/schematic/components/isOwnedRecordVisible.ts
 function isOwnedRecordVisible(record, currentPartId) {
   const ownerPartId = record.getNumber("OWNERPARTID");
@@ -3304,14 +3432,7 @@ function convertComponent({
     );
     return;
   }
-  const visibleSymbolLabels = new Set(
-    visibleOwnedRecords.filter(
-      (record) => record instanceof AltiumSchLabelRecord
-    ).flatMap((record) => {
-      const text = record.text?.trim().toUpperCase();
-      return text ? [text] : [];
-    })
-  );
+  const visibleSymbolLabels = getVisibleSymbolLabels(visibleOwnedRecords);
   const componentPorts = pins.map(
     (pin, pinIndex) => convertComponentPin({
       document,
@@ -3332,6 +3453,11 @@ function convertComponent({
     libraryReference: identity.libraryReference,
     ports: componentPorts
   });
+  const ownedLogicGateBody = symbolSelection ? void 0 : convertOwnedLogicGateBody(
+    { identity, pins, records: visibleOwnedRecords, visibleSymbolLabels },
+    context
+  );
+  const hasOwnedLogicGateBody = ownedLogicGateBody !== void 0;
   const center = scalePoint(getBoundsCenter(bodyBounds), options.scale);
   const size = symbolSelection ? { ...symbolSelection.symbol.size } : {
     height: Math.max(
@@ -3347,7 +3473,11 @@ function convertComponent({
     applyNativeSymbolPortGeometry({ center, selection: symbolSelection });
   }
   const pinEdgeElements = createComponentPinEdgeElements(
-    { componentPorts, pins },
+    {
+      componentPorts,
+      includeNumericDesignators: hasOwnedLogicGateBody,
+      pins
+    },
     context
   );
   convertedPorts.push(...componentPorts);
@@ -3358,12 +3488,13 @@ function convertComponent({
         ...isSchematicVisible ? [schematicPort] : []
       ]
     ),
-    ...pinEdgeElements
+    ...pinEdgeElements,
+    ...ownedLogicGateBody ?? []
   );
   const schematicComponent = {
     type: "schematic_component",
     center,
-    is_box_with_pins: true,
+    is_box_with_pins: !hasOwnedLogicGateBody,
     schematic_component_id: identity.schematicComponentId,
     schematic_sheet_id: options.schematicSheetId,
     size,
@@ -3372,7 +3503,7 @@ function convertComponent({
     ...symbolSelection ? { symbol_name: symbolSelection.name } : {}
   };
   elements.push(schematicComponent);
-  if (!symbolSelection && options.includeText !== false) {
+  if (!symbolSelection && !hasOwnedLogicGateBody && options.includeText !== false) {
     addComponentFallbackText({
       componentIndex,
       designator: identity.designator,
@@ -3700,10 +3831,10 @@ function createSchematicConversionContext({
 }
 
 // lib/schematic/document/translateSchematicPoint.ts
-import { applyToPoint as applyToPoint7, translate as translate3 } from "transformation-matrix";
+import { applyToPoint as applyToPoint8, translate as translate4 } from "transformation-matrix";
 function translateSchematicPoint(point, offset) {
-  const sourceToSheetTransform = translate3(offset.x, offset.y);
-  return applyToPoint7(sourceToSheetTransform, point);
+  const sourceToSheetTransform = translate4(offset.x, offset.y);
+  return applyToPoint8(sourceToSheetTransform, point);
 }
 
 // lib/schematic/document/translateSchematicElement.ts
@@ -3932,9 +4063,9 @@ function appendConnectedPath({
 // lib/pcb/geometry/createOctagonPoints.ts
 import {
   applyToPoints,
-  compose as compose2,
-  rotateDEG as rotateDEG2,
-  translate as translate4
+  compose as compose3,
+  rotateDEG as rotateDEG3,
+  translate as translate5
 } from "transformation-matrix";
 function createOctagonPoints({
   x,
@@ -3956,9 +4087,9 @@ function createOctagonPoints({
     { x: -halfWidth, y: halfHeight - chamfer },
     { x: -halfWidth, y: -halfHeight + chamfer }
   ];
-  const localToPcbTransform = compose2(
-    translate4(x, y),
-    rotateDEG2(ccwRotationDegrees)
+  const localToPcbTransform = compose3(
+    translate5(x, y),
+    rotateDEG3(ccwRotationDegrees)
   );
   return applyToPoints(localToPcbTransform, points);
 }
@@ -4802,10 +4933,10 @@ import {
 import { normalizeAltiumAngle } from "altiumts";
 
 // lib/pcb/pads/getRotatedHoleOffset.ts
-import { applyToPoint as applyToPoint8, rotateDEG as rotateDEG3 } from "transformation-matrix";
+import { applyToPoint as applyToPoint9, rotateDEG as rotateDEG4 } from "transformation-matrix";
 function getRotatedHoleOffset(geometry) {
-  const padToPcbTransform = rotateDEG3(geometry.ccwRotationDegrees);
-  return applyToPoint8(padToPcbTransform, {
+  const padToPcbTransform = rotateDEG4(geometry.ccwRotationDegrees);
+  return applyToPoint9(padToPcbTransform, {
     x: geometry.holeOffsetXMils,
     y: geometry.holeOffsetYMils
   });