altium-to-circuit-json 0.0.71 → 0.0.72

package/dist/index.js

@@ -3023,6 +3023,54 @@ function convertComponentPin({
   };
 }
 
+// lib/schematic/components/convertOwnedCustomComponentBody.ts
+import {
+  AltiumSchEllipseRecord,
+  AltiumSchEllipticalArcRecord,
+  AltiumSchPolygonRecord,
+  AltiumSchPolylineRecord
+} from "altiumts";
+
+// lib/schematic/components/convertOwnedComponentRecords.ts
+import {
+  AltiumSchImageRecord as AltiumSchImageRecord2,
+  AltiumSchPinRecord
+} from "altiumts";
+function convertOwnedComponentRecords({
+  ownedRecords,
+  schematicComponentId
+}, context) {
+  const records = context.document.records;
+  const renderingContext = {
+    document: context.document,
+    records,
+    scale: context.options.scale,
+    sheetRecord: records.find((record) => record.recordKind === "31")
+  };
+  return ownedRecords.flatMap((record) => {
+    if (record instanceof AltiumSchImageRecord2) return [];
+    const index = records.indexOf(record);
+    if (index < 0) return [];
+    const elements = convertSchematicRecord(
+      {
+        index,
+        options: {
+          includeHidden: context.options.includeHidden,
+          includeText: record instanceof AltiumSchPinRecord ? false : context.options.includeText
+        },
+        record
+      },
+      renderingContext
+    );
+    return elements.map(
+      (element) => element.type === "schematic_text" ? element : {
+        ...element,
+        schematic_component_id: schematicComponentId
+      }
+    );
+  });
+}
+
 // lib/schematic/rendering/convertSchematicArcToPath.ts
 import {
   applyToPoint as applyToPoint7,
@@ -3064,46 +3112,42 @@ function convertSchematicArcToPath(schematicArc) {
   };
 }
 
-// lib/schematic/components/convertOwnedComponentRecords.ts
-import {
-  AltiumSchImageRecord as AltiumSchImageRecord2,
-  AltiumSchPinRecord
-} from "altiumts";
-function convertOwnedComponentRecords({
-  ownedRecords,
-  schematicComponentId
-}, context) {
-  const records = context.document.records;
-  const renderingContext = {
-    document: context.document,
-    records,
-    scale: context.options.scale,
-    sheetRecord: records.find((record) => record.recordKind === "31")
-  };
-  return ownedRecords.flatMap((record) => {
-    if (record instanceof AltiumSchImageRecord2) return [];
-    const index = records.indexOf(record);
-    if (index < 0) return [];
-    const elements = convertSchematicRecord(
-      {
-        index,
-        options: {
-          includeHidden: context.options.includeHidden,
-          includeText: record instanceof AltiumSchPinRecord ? false : context.options.includeText
-        },
-        record
-      },
-      renderingContext
-    );
-    return elements.map(
-      (element) => element.type === "schematic_text" ? element : {
-        ...element,
-        schematic_component_id: schematicComponentId
-      }
-    );
+// lib/schematic/components/prepareOwnedComponentBodyElements.ts
+function prepareOwnedComponentBodyElements(elements) {
+  return elements.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/convertOwnedCustomComponentBody.ts
+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
+  );
+  if (!hasEllipse || !hasEllipticalArc || !hasPolygon) return void 0;
+  const ownedElements = convertOwnedComponentRecords(
+    {
+      ownedRecords: records,
+      schematicComponentId: identity.schematicComponentId
+    },
+    context
+  );
+  return prepareOwnedComponentBodyElements(ownedElements);
+}
+
 // lib/schematic/components/convertOwnedLogicGateBody.ts
 function convertOwnedLogicGateBody({
   identity,
@@ -3131,18 +3175,25 @@ function convertOwnedLogicGateBody({
   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;
-  });
+  return prepareOwnedComponentBodyElements(ownedElements);
+}
+
+// lib/schematic/components/convertOwnedComponentBody.ts
+function convertOwnedComponentBody({
+  identity,
+  pins,
+  records,
+  visibleSymbolLabels
+}, context) {
+  return convertOwnedLogicGateBody(
+    { identity, pins, records, visibleSymbolLabels },
+    context
+  ) ?? convertOwnedCustomComponentBody({ identity, records }, context);
 }
 
 // lib/schematic/components/getComponentBodyBounds.ts
 import {
-  AltiumSchEllipseRecord,
+  AltiumSchEllipseRecord as AltiumSchEllipseRecord2,
   AltiumSchPinRecord as AltiumSchPinRecord2,
   AltiumSchRectangleRecord,
   getSchematicRecordPoints as getSchematicRecordPoints6
@@ -3162,7 +3213,7 @@ function getComponentBodyBounds(records, portPoints) {
     const corner = getCorner(record);
     if (location && corner) points.push(location, corner);
     points.push(...getSchematicRecordPoints6(record));
-    if (record instanceof AltiumSchEllipseRecord && location) {
+    if (record instanceof AltiumSchEllipseRecord2 && location) {
       const radiusX = Math.abs(
         getCoordinateOrFallback({ record, key: "RADIUS", fallback: 0 })
       );
@@ -3637,11 +3688,11 @@ function convertComponent({
     libraryReference: identity.libraryReference,
     ports: componentPorts
   });
-  const ownedLogicGateBody = symbolSelection ? void 0 : convertOwnedLogicGateBody(
+  const ownedComponentBody = symbolSelection ? void 0 : convertOwnedComponentBody(
     { identity, pins, records: visibleOwnedRecords, visibleSymbolLabels },
     context
   );
-  const hasOwnedLogicGateBody = ownedLogicGateBody !== void 0;
+  const hasOwnedComponentBody = ownedComponentBody !== void 0;
   const center = scalePoint(getBoundsCenter(bodyBounds), options.scale);
   const size = symbolSelection ? { ...symbolSelection.symbol.size } : {
     height: Math.max(
@@ -3659,7 +3710,7 @@ function convertComponent({
   const pinEdgeElements = createComponentPinEdgeElements(
     {
       componentPorts,
-      includeNumericDesignators: hasOwnedLogicGateBody,
+      includeNumericDesignators: hasOwnedComponentBody,
       pins
     },
     context
@@ -3673,12 +3724,12 @@ function convertComponent({
       ]
     ),
     ...pinEdgeElements,
-    ...ownedLogicGateBody ?? []
+    ...ownedComponentBody ?? []
   );
   const schematicComponent = {
     type: "schematic_component",
     center,
-    is_box_with_pins: !hasOwnedLogicGateBody,
+    is_box_with_pins: !hasOwnedComponentBody,
     schematic_component_id: identity.schematicComponentId,
     schematic_sheet_id: options.schematicSheetId,
     size,
@@ -3687,7 +3738,7 @@ function convertComponent({
     ...symbolSelection ? { symbol_name: symbolSelection.name } : {}
   };
   elements.push(schematicComponent);
-  if (!symbolSelection && !hasOwnedLogicGateBody && options.includeText !== false) {
+  if (!symbolSelection && !hasOwnedComponentBody && options.includeText !== false) {
     addComponentFallbackText({
       componentIndex,
       designator: identity.designator,