altium-to-circuit-json 0.0.80 → 0.0.82

package/dist/index.js

@@ -1975,7 +1975,7 @@ function addComponentFallbackText({
 }
 
 // lib/schematic/components/convertComponent.ts
-import { AltiumSchPinRecord as AltiumSchPinRecord3 } from "altiumts";
+import { AltiumSchPinRecord as AltiumSchPinRecord5 } from "altiumts";
 
 // lib/schematic/symbols/applyNativeSymbolPortGeometry.ts
 import { applyToPoint as applyToPoint6, translate as translate2 } from "transformation-matrix";
@@ -3220,8 +3220,10 @@ function convertComponentPin({
 
 // lib/schematic/components/convertOwnedCustomComponentBody.ts
 import {
+  AltiumSchArcRecord,
   AltiumSchEllipseRecord,
   AltiumSchEllipticalArcRecord,
+  AltiumSchLineRecord,
   AltiumSchPolygonRecord,
   AltiumSchPolylineRecord
 } from "altiumts";
@@ -3323,16 +3325,23 @@ function convertOwnedCustomComponentBody({
   identity,
   records
 }, context) {
-  const hasEllipse = records.some(
-    (record) => record instanceof AltiumSchEllipseRecord
-  );
-  const hasEllipticalArc = records.some(
-    (record) => record instanceof AltiumSchEllipticalArcRecord
-  );
-  const hasPolygon = records.some(
-    (record) => record instanceof AltiumSchPolygonRecord || record instanceof AltiumSchPolylineRecord
+  const bodyPrimitiveKinds = new Set(
+    records.flatMap((record) => {
+      if (record instanceof AltiumSchEllipseRecord) return ["ellipse"];
+      if (record instanceof AltiumSchArcRecord || record instanceof AltiumSchEllipticalArcRecord) {
+        return ["arc"];
+      }
+      if (record instanceof AltiumSchLineRecord) return ["line"];
+      if (record instanceof AltiumSchPolygonRecord || record instanceof AltiumSchPolylineRecord) {
+        return ["polygon"];
+      }
+      return [];
+    })
   );
-  if (!hasEllipse || !hasEllipticalArc || !hasPolygon) return void 0;
+  const bodyPrimitiveCount = records.filter(
+    (record) => record instanceof AltiumSchEllipseRecord || record instanceof AltiumSchArcRecord || record instanceof AltiumSchEllipticalArcRecord || record instanceof AltiumSchLineRecord || record instanceof AltiumSchPolygonRecord || record instanceof AltiumSchPolylineRecord
+  ).length;
+  if (bodyPrimitiveCount < 3 || bodyPrimitiveKinds.size < 2) return void 0;
   const ownedElements = convertOwnedComponentRecords(
     {
       ownedRecords: records,
@@ -3343,6 +3352,11 @@ function convertOwnedCustomComponentBody({
   return prepareOwnedComponentBodyElements(ownedElements);
 }
 
+// lib/schematic/components/normalizeLogicGatePinName.ts
+function normalizeLogicGatePinName(name) {
+  return name?.trim().toUpperCase().replace(/^\d+(?=[A-Z]+$)/u, "");
+}
+
 // lib/schematic/components/convertOwnedLogicGateBody.ts
 function convertOwnedLogicGateBody({
   identity,
@@ -3353,7 +3367,7 @@ function convertOwnedLogicGateBody({
   const logicGateLabels = /* @__PURE__ */ new Set([
     ...visibleSymbolLabels,
     ...pins.flatMap((pin) => {
-      const name = pin.getDecoded("NAME")?.trim().toUpperCase();
+      const name = normalizeLogicGatePinName(pin.getDecoded("NAME"));
       return name ? [name] : [];
     })
   ]);
@@ -3386,10 +3400,204 @@ function convertOwnedComponentBody({
   ) ?? convertOwnedCustomComponentBody({ identity, records }, context);
 }
 
+// lib/schematic/components/convertOwnedSingleInputGateBody.ts
+import { AltiumSchPinRecord as AltiumSchPinRecord3 } from "altiumts";
+
+// lib/schematic/components/convertPrimitiveGatePin.ts
+import { AltiumSchPinRecord as AltiumSchPinRecord2 } from "altiumts";
+
+// lib/schematic/components/createPinClockSymbol.ts
+var EDGE_VECTOR_BY_SIDE = {
+  bottom: { x: 0, y: 1 },
+  left: { x: 1, y: 0 },
+  right: { x: -1, y: 0 },
+  top: { x: 0, y: -1 }
+};
+function createPinClockSymbol({
+  pin,
+  recordIndex,
+  scale: scale5,
+  schematicPort
+}) {
+  const side = schematicPort.side_of_component;
+  if (pin.getNumber("SYMBOL_INNEREDGE") !== 3 || !side) return void 0;
+  const edgeVector = EDGE_VECTOR_BY_SIDE[side];
+  const pinLength = schematicPort.distance_from_component_edge ?? 0.4;
+  const bodyPosition = {
+    x: schematicPort.center.x + edgeVector.x * pinLength,
+    y: schematicPort.center.y + edgeVector.y * pinLength
+  };
+  const clockDepth = scaleLength(4, scale5);
+  const clockHalfWidth = scaleLength(2, scale5);
+  const perpendicularVector = { x: -edgeVector.y, y: edgeVector.x };
+  const clockTip = {
+    x: bodyPosition.x + edgeVector.x * clockDepth,
+    y: bodyPosition.y + edgeVector.y * clockDepth
+  };
+  const clockBaseStart = {
+    x: bodyPosition.x + perpendicularVector.x * clockHalfWidth,
+    y: bodyPosition.y + perpendicularVector.y * clockHalfWidth
+  };
+  const clockBaseEnd = {
+    x: bodyPosition.x - perpendicularVector.x * clockHalfWidth,
+    y: bodyPosition.y - perpendicularVector.y * clockHalfWidth
+  };
+  return {
+    type: "schematic_path",
+    fill_color: "transparent",
+    is_dashed: false,
+    is_filled: false,
+    points: [clockTip, clockBaseStart, clockBaseEnd, clockTip],
+    schematic_component_id: schematicPort.schematic_component_id,
+    schematic_path_id: `schematic_pin_clock_altium_${recordIndex}`,
+    schematic_sheet_id: schematicPort.schematic_sheet_id,
+    stroke_color: "#a90000",
+    stroke_width: 0.02
+  };
+}
+
+// lib/schematic/components/convertPrimitiveGatePin.ts
+function convertPrimitiveGatePin(port, context) {
+  const pin = port.record;
+  if (!(pin instanceof AltiumSchPinRecord2) || !port.isSchematicVisible)
+    return [];
+  const index = context.document.records.indexOf(pin);
+  const scale5 = context.options.scale;
+  const color = altiumColorToCss(pin.getCaseInsensitive("COLOR"), "#000000");
+  const renderingContext = {
+    document: context.document,
+    records: context.document.records,
+    scale: scale5,
+    sheetRecord: context.document.records.find(
+      (record) => record.recordKind === "31"
+    )
+  };
+  const elements = renderPin({
+    record: pin,
+    index,
+    context: renderingContext,
+    options: context.options,
+    color
+  });
+  const nameLabel = elements.find(
+    (element) => element.type === "schematic_text" && element.schematic_text_id === `schematic_pin_name_altium_${index}`
+  );
+  if (nameLabel?.type === "schematic_text") {
+    const parsedLabel = parseAltiumPinLabel(nameLabel.text);
+    nameLabel.text = parsedLabel.displayText;
+    if (parsedLabel.textParts) nameLabel.text_parts = parsedLabel.textParts;
+    nameLabel.font_size = port.schematicPort.display_pin_label_font_size ?? nameLabel.font_size;
+  }
+  const line = elements.find((element) => element.type === "schematic_line");
+  if (line) {
+    line.stroke_width = scaleLength(1, scale5);
+    const direction = VECTOR_BY_DIRECTION[port.schematicPort.facing_direction ?? "right"];
+    const designator = elements.find(
+      (element) => element.type === "schematic_text" && element.schematic_text_id === `schematic_pin_designator_altium_${index}`
+    );
+    if (designator?.type === "schematic_text") {
+      const margin = scaleLength(9, scale5);
+      designator.position = {
+        x: line.x1 + direction.x * margin,
+        y: line.y1 + direction.y * margin
+      };
+      designator.anchor = direction.x > 0 || direction.y > 0 ? "bottom_left" : "bottom_right";
+      designator.font_size = scaleLength(
+        getFontSize(pin, renderingContext),
+        scale5
+      );
+    }
+    if (pin.getNumber("SYMBOL_OUTEREDGE") === 1) {
+      const radius = scaleLength(2.5, scale5);
+      elements.push({
+        type: "schematic_circle",
+        schematic_circle_id: `schematic_pin_inversion_altium_${index}`,
+        schematic_sheet_id: context.options.schematicSheetId,
+        center: {
+          x: line.x1 + direction.x * radius,
+          y: line.y1 + direction.y * radius
+        },
+        radius,
+        color,
+        stroke_width: scaleLength(1, scale5),
+        is_filled: true,
+        fill_color: "#ffffff",
+        is_dashed: false
+      });
+      line.x1 += direction.x * radius * 2;
+      line.y1 += direction.y * radius * 2;
+    }
+  }
+  const clock = createPinClockSymbol({
+    pin,
+    recordIndex: index,
+    scale: scale5,
+    schematicPort: port.schematicPort
+  });
+  if (clock) elements.push(clock);
+  delete port.schematicPort.display_pin_label;
+  delete port.schematicPort.display_pin_label_text_parts;
+  return elements.map(
+    (element) => element.type === "schematic_line" || element.type === "schematic_circle" || element.type === "schematic_path" ? {
+      ...element,
+      schematic_component_id: port.schematicPort.schematic_component_id
+    } : element
+  );
+}
+
+// lib/schematic/components/hasTriangularLineBody.ts
+function hasTriangularLineBody(records) {
+  const lines = records.flatMap((record) => {
+    if (record.recordKind !== "13") return [];
+    const start = getLocation(record);
+    const end = getCorner(record);
+    return start && end && !pointsEqual(start, end) ? [{ start, end }] : [];
+  });
+  return lines.some(
+    (first) => lines.some((second) => {
+      const apex = pointsEqual(first.end, second.start) ? second.end : pointsEqual(first.end, second.end) ? second.start : void 0;
+      if (!apex) return false;
+      const twiceArea = (first.end.x - first.start.x) * (apex.y - first.start.y) - (first.end.y - first.start.y) * (apex.x - first.start.x);
+      if (Math.abs(twiceArea) < 1e-6) return false;
+      return lines.some(
+        (third) => pointsEqual(third.start, apex) && pointsEqual(third.end, first.start) || pointsEqual(third.end, apex) && pointsEqual(third.start, first.start)
+      );
+    })
+  );
+}
+
+// lib/schematic/components/convertOwnedSingleInputGateBody.ts
+function convertOwnedSingleInputGateBody({
+  identity,
+  records,
+  componentPorts
+}, context) {
+  const pinNames = componentPorts.map(
+    (port) => normalizeLogicGatePinName(port.sourcePort.name)
+  );
+  if (!pinNames.includes("A") || !pinNames.includes("Y") || pinNames.includes("B")) {
+    return void 0;
+  }
+  if (!hasTriangularLineBody(records)) return void 0;
+  const body = convertOwnedComponentRecords(
+    {
+      ownedRecords: records.filter(
+        (record) => !(record instanceof AltiumSchPinRecord3)
+      ),
+      schematicComponentId: identity.schematicComponentId
+    },
+    context
+  );
+  return [
+    ...body,
+    ...componentPorts.flatMap((port) => convertPrimitiveGatePin(port, context))
+  ];
+}
+
 // lib/schematic/components/getComponentBodyBounds.ts
 import {
   AltiumSchEllipseRecord as AltiumSchEllipseRecord2,
-  AltiumSchPinRecord as AltiumSchPinRecord2,
+  AltiumSchPinRecord as AltiumSchPinRecord4,
   AltiumSchRectangleRecord,
   getSchematicRecordPoints as getSchematicRecordPoints6
 } from "altiumts";
@@ -3403,7 +3611,7 @@ function getComponentBodyBounds(records, portPoints) {
   if (rectangles.length > 0) return mergeBounds(rectangles);
   const points = [];
   for (const record of records) {
-    if (record instanceof AltiumSchPinRecord2) continue;
+    if (record instanceof AltiumSchPinRecord4) continue;
     const location = getLocation(record);
     const corner = getCorner(record);
     if (location && corner) points.push(location, corner);
@@ -3476,7 +3684,7 @@ function convertPinlessComponent({
 }
 
 // lib/schematic/components/createAlphanumericPinDesignatorText.ts
-var EDGE_VECTOR_BY_SIDE = {
+var EDGE_VECTOR_BY_SIDE2 = {
   bottom: { x: 0, y: 1 },
   left: { x: 1, y: 0 },
   right: { x: -1, y: 0 },
@@ -3494,7 +3702,7 @@ function createAlphanumericPinDesignatorText({
   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_SIDE[side];
+  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,
@@ -3515,7 +3723,7 @@ function createAlphanumericPinDesignatorText({
 }
 
 // lib/schematic/components/createNumericPinDesignatorText.ts
-var EDGE_VECTOR_BY_SIDE2 = {
+var EDGE_VECTOR_BY_SIDE3 = {
   bottom: { x: 0, y: 1 },
   left: { x: 1, y: 0 },
   right: { x: -1, y: 0 },
@@ -3533,7 +3741,7 @@ function createNumericPinDesignatorText({
   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 edgeVector = EDGE_VECTOR_BY_SIDE3[side];
   const halfPinLength = (schematicPort.distance_from_component_edge ?? 0.4) / 2;
   const position = {
     x: schematicPort.center.x + edgeVector.x * halfPinLength,
@@ -3553,56 +3761,6 @@ function createNumericPinDesignatorText({
   };
 }
 
-// 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,
-  scale: scale5,
-  schematicPort
-}) {
-  const side = schematicPort.side_of_component;
-  if (pin.getNumber("SYMBOL_INNEREDGE") !== 3 || !side) return void 0;
-  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,
-    y: schematicPort.center.y + edgeVector.y * pinLength
-  };
-  const clockDepth = scaleLength(4, scale5);
-  const clockHalfWidth = scaleLength(2, scale5);
-  const perpendicularVector = { x: -edgeVector.y, y: edgeVector.x };
-  const clockTip = {
-    x: bodyPosition.x + edgeVector.x * clockDepth,
-    y: bodyPosition.y + edgeVector.y * clockDepth
-  };
-  const clockBaseStart = {
-    x: bodyPosition.x + perpendicularVector.x * clockHalfWidth,
-    y: bodyPosition.y + perpendicularVector.y * clockHalfWidth
-  };
-  const clockBaseEnd = {
-    x: bodyPosition.x - perpendicularVector.x * clockHalfWidth,
-    y: bodyPosition.y - perpendicularVector.y * clockHalfWidth
-  };
-  return {
-    type: "schematic_path",
-    fill_color: "transparent",
-    is_dashed: false,
-    is_filled: false,
-    points: [clockTip, clockBaseStart, clockBaseEnd, clockTip],
-    schematic_component_id: schematicPort.schematic_component_id,
-    schematic_path_id: `schematic_pin_clock_altium_${recordIndex}`,
-    schematic_sheet_id: schematicPort.schematic_sheet_id,
-    stroke_color: "#a90000",
-    stroke_width: 0.02
-  };
-}
-
 // lib/schematic/components/createComponentPinEdgeElements.ts
 function createComponentPinEdgeElements({
   componentPorts,
@@ -3843,7 +4001,7 @@ function convertComponent({
     (record) => isOwnedRecordVisible(record, currentPartId)
   );
   const pins = visibleOwnedRecords.filter(
-    (record) => record instanceof AltiumSchPinRecord3 && (!isPinHidden(record) || options.includeHidden === true)
+    (record) => record instanceof AltiumSchPinRecord5 && (!isPinHidden(record) || options.includeHidden === true)
   );
   const identity = getComponentIdentity(
     { componentIndex, componentRecord, ownedRecords },
@@ -3852,12 +4010,8 @@ function convertComponent({
   if (identity.shouldCreateSourceComponent) {
     elements.push(
       createSourceComponent({
-        displayText: identity.displayText,
-        designator: identity.designator,
-        libraryReference: identity.libraryReference,
-        manufacturerPartNumber: identity.manufacturerPartNumber,
-        pinCount: pins.length,
-        sourceComponentId: identity.sourceComponentId
+        ...identity,
+        pinCount: pins.length
       })
     );
   }
@@ -3890,11 +4044,14 @@ function convertComponent({
     libraryReference: identity.libraryReference,
     ports: componentPorts
   });
-  const ownedComponentBody = symbolSelection ? void 0 : convertOwnedComponentBody(
-    { identity, pins, records: visibleOwnedRecords, visibleSymbolLabels },
+  const singleInputGateBody = symbolSelection ? void 0 : convertOwnedSingleInputGateBody(
+    { identity, records: visibleOwnedRecords, componentPorts },
     context
   );
-  const hasOwnedComponentBody = ownedComponentBody !== void 0;
+  const ownedComponentBody = singleInputGateBody ?? (symbolSelection ? void 0 : convertOwnedComponentBody(
+    { identity, pins, records: visibleOwnedRecords, visibleSymbolLabels },
+    context
+  ));
   const center = scalePoint(getBoundsCenter(bodyBounds), options.scale);
   const size = symbolSelection ? { ...symbolSelection.symbol.size } : {
     height: Math.max(
@@ -3909,11 +4066,11 @@ function convertComponent({
   if (symbolSelection) {
     applyNativeSymbolPortGeometry({ center, selection: symbolSelection });
   }
-  const pinEdgeElements = createComponentPinEdgeElements(
+  const pinEdgeElements = singleInputGateBody ? [] : createComponentPinEdgeElements(
     {
       componentPorts,
-      includeNumericDesignators: hasOwnedComponentBody,
-      pins
+      pins,
+      includeNumericDesignators: Boolean(ownedComponentBody) && options.includeText !== false
     },
     context
   );
@@ -3931,7 +4088,7 @@ function convertComponent({
   const schematicComponent = {
     type: "schematic_component",
     center,
-    is_box_with_pins: !hasOwnedComponentBody,
+    is_box_with_pins: !ownedComponentBody,
     schematic_component_id: identity.schematicComponentId,
     schematic_sheet_id: options.schematicSheetId,
     size,
@@ -3940,15 +4097,15 @@ function convertComponent({
     ...symbolSelection ? { symbol_name: symbolSelection.name } : {}
   };
   elements.push(schematicComponent);
-  if (!symbolSelection && !hasOwnedComponentBody && options.includeText !== false) {
-    addComponentFallbackText({
-      componentIndex,
-      designator: identity.designator,
-      displayText: identity.displayText,
-      elements,
-      schematicComponent
-    });
-  }
+  if (symbolSelection || ownedComponentBody || options.includeText === false)
+    return;
+  addComponentFallbackText({
+    componentIndex,
+    designator: identity.designator,
+    displayText: identity.displayText,
+    elements,
+    schematicComponent
+  });
 }
 
 // lib/schematic/components/convertComponents.ts