altium-to-circuit-json 0.0.93 → 0.0.95

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as circuit_json from 'circuit-json';
-import { LayerRef, SourceSimpleChip, SourcePort, AnyCircuitElement, SourceNet, SourceTrace } from 'circuit-json';
-import { AltiumPcbDocument, AltiumPrjPcb, AltiumRecord, AltiumPadRecord, AltiumSchDoc } from 'altiumts';
+import { LayerRef, SourceSimpleChip, SourcePort, AnyCircuitElement, SourceNet, SourceTrace, SchematicPort } from 'circuit-json';
+import { AltiumPcbDocument, AltiumPrjPcb, AltiumRecord, AltiumPadRecord, AltiumPoint, AltiumSchDoc } from 'altiumts';
 import * as zod from 'zod';
 
 declare class PcbCopperLayerMap {
@@ -45,7 +45,16 @@ interface PcbConversionContext {
     options: ConvertAltiumPcbDocOptions;
 }
 
+interface ConvertedPort {
+    isSchematicVisible: boolean;
+    point: AltiumPoint;
+    record: AltiumRecord;
+    schematicPort: SchematicPort;
+    sourcePort: SourcePort;
+}
+
 interface SchematicConversionContext extends SchematicContext {
+    convertedPorts: ConvertedPort[];
     elements: AnyCircuitElement[];
     handledRecords: Set<AltiumRecord>;
     options: ConvertAltiumSchDocOptions;

package/dist/index.js

@@ -1644,6 +1644,34 @@ function renderSchematicPolylineRecord({
   ];
 }
 
+// lib/schematic/geometry/getRoundedRectangleCircle.ts
+function getRoundedRectangleCircle(record) {
+  if (record.recordKind !== "10") return void 0;
+  const bounds = getRectangle(record);
+  if (!bounds) return void 0;
+  const width = bounds.maxX - bounds.minX;
+  const height = bounds.maxY - bounds.minY;
+  if (width <= 0 || Math.abs(width - height) > 1e-4) return void 0;
+  const radiusX = getCoordinateOrFallback({
+    record,
+    key: "CORNERXRADIUS",
+    fallback: 0
+  });
+  const radiusY = getCoordinateOrFallback({
+    record,
+    key: "CORNERYRADIUS",
+    fallback: radiusX
+  });
+  if (radiusX < width / 2 || radiusY < height / 2) return void 0;
+  return {
+    center: {
+      x: (bounds.minX + bounds.maxX) / 2,
+      y: (bounds.minY + bounds.maxY) / 2
+    },
+    radius: width / 2
+  };
+}
+
 // lib/schematic/rendering/renderSchematicRectangleRecord.ts
 function renderSchematicRectangleRecord({
   color,
@@ -1655,6 +1683,26 @@ function renderSchematicRectangleRecord({
   if (record.recordKind !== "10" && record.recordKind !== "14") return void 0;
   const rectangle = getRectangle(record);
   if (!rectangle) return [];
+  const circle = getRoundedRectangleCircle(record);
+  if (circle) {
+    return [
+      {
+        type: "schematic_circle",
+        schematic_circle_id: `schematic_circle_altium_${index}`,
+        schematic_sheet_id: SCHEMATIC_SHEET_ID,
+        center: scalePoint(circle.center, context.scale),
+        radius: scaleLength(circle.radius, context.scale),
+        stroke_width: strokeWidth,
+        color,
+        is_filled: record.getBoolean("ISSOLID") === true,
+        fill_color: altiumColorToCss(
+          record.getCaseInsensitive("AREACOLOR"),
+          "#ffffff"
+        ),
+        is_dashed: false
+      }
+    ];
+  }
   return [
     {
       type: "schematic_rect",
@@ -1957,6 +2005,27 @@ function convertSchematicRecord({
   return [];
 }
 
+// lib/schematic/rendering/associateNoErcMarkerWithPortAtAnchor.ts
+function associateNoErcMarkerWithPortAtAnchor({
+  convertedPorts,
+  markerAnchor,
+  markerElements,
+  schematicUnitScale
+}) {
+  const markerLine = markerElements.find(
+    (element) => element.type === "schematic_line"
+  );
+  if (!markerLine) return markerElements;
+  const matchingPort = convertedPorts.find(
+    ({ point, schematicPort }) => schematicPort.schematic_sheet_id === markerLine.schematic_sheet_id && pointsEqual(scalePoint(point, schematicUnitScale), markerAnchor)
+  );
+  const schematicComponentId = matchingPort?.schematicPort.schematic_component_id;
+  if (!schematicComponentId) return markerElements;
+  return markerElements.map(
+    (element) => element.type === "schematic_line" ? { ...element, schematic_component_id: schematicComponentId } : element
+  );
+}
+
 // lib/schematic/document/shouldRenderSchematicRecord.ts
 function shouldRenderSchematicRecord(record, context) {
   let ownerPartId = record.getNumber("OWNERPARTID");
@@ -1987,11 +2056,18 @@ function convertRemainingSchematicRecords(context) {
   for (const [recordIndex, record] of context.records.entries()) {
     if (context.handledRecords.has(record)) continue;
     if (!shouldRenderSchematicRecord(record, context)) continue;
+    const convertedElements = convertSchematicRecord(
+      { record, index: recordIndex, options: context.options },
+      context
+    );
+    const noErcMarkerLocation = record.recordKind === "22" ? getLocation(record) : void 0;
     context.elements.push(
-      ...convertSchematicRecord(
-        { record, index: recordIndex, options: context.options },
-        context
-      )
+      ...noErcMarkerLocation ? associateNoErcMarkerWithPortAtAnchor({
+        convertedPorts: context.convertedPorts,
+        markerAnchor: scalePoint(noErcMarkerLocation, context.scale),
+        markerElements: convertedElements,
+        schematicUnitScale: context.scale
+      }) : convertedElements
     );
   }
 }
@@ -3320,7 +3396,9 @@ import {
   AltiumSchEllipticalArcRecord,
   AltiumSchLineRecord,
   AltiumSchPolygonRecord,
-  AltiumSchPolylineRecord
+  AltiumSchPolylineRecord,
+  AltiumSchRectangleRecord,
+  AltiumSchRoundedRectangleRecord
 } from "altiumts";
 
 // lib/schematic/components/convertOwnedComponentRecords.ts
@@ -3443,7 +3521,16 @@ function convertOwnedCustomComponentBody({
   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 hasCircularShape = records.some(
+    (record) => record instanceof AltiumSchEllipseRecord || getRoundedRectangleCircle(record) !== void 0
+  );
+  const hasOtherBodyShape = records.some(
+    (record) => record instanceof AltiumSchRectangleRecord || record instanceof AltiumSchRoundedRectangleRecord && getRoundedRectangleCircle(record) === void 0 || record instanceof AltiumSchArcRecord || record instanceof AltiumSchEllipticalArcRecord || record instanceof AltiumSchLineRecord || record instanceof AltiumSchPolygonRecord || record instanceof AltiumSchPolylineRecord
+  );
+  const hasSimpleCircularBody = hasCircularShape && !hasOtherBodyShape;
+  if (!hasSimpleCircularBody && (bodyPrimitiveCount < 3 || bodyPrimitiveKinds.size < 2)) {
+    return void 0;
+  }
   const ownedElements = convertOwnedComponentRecords(
     {
       ownedRecords: records,
@@ -3700,12 +3787,12 @@ function convertOwnedSingleInputGateBody({
 import {
   AltiumSchEllipseRecord as AltiumSchEllipseRecord2,
   AltiumSchPinRecord as AltiumSchPinRecord4,
-  AltiumSchRectangleRecord,
+  AltiumSchRectangleRecord as AltiumSchRectangleRecord2,
   getSchematicRecordPoints as getSchematicRecordPoints6
 } from "altiumts";
 function getComponentBodyBounds(records, portPoints) {
   const rectangles = records.filter(
-    (record) => record instanceof AltiumSchRectangleRecord
+    (record) => record instanceof AltiumSchRectangleRecord2
   ).flatMap((record) => {
     const rectangle = getRectangle(record);
     return rectangle ? [rectangle] : [];
@@ -4485,7 +4572,7 @@ function convertSemanticSchematic(document, options) {
     semanticNetGraph,
     options
   });
-  return { elements, handledRecords };
+  return { convertedPorts, elements, handledRecords };
 }
 
 // lib/schematic/document/convertSchematicSemantics.ts
@@ -4495,6 +4582,7 @@ function convertSchematicSemantics(context) {
     scale: context.scale,
     schematicSheetId: SCHEMATIC_SHEET_ID
   });
+  context.convertedPorts.push(...conversion.convertedPorts);
   context.elements.push(...conversion.elements);
   for (const record of conversion.handledRecords) {
     if (record instanceof AltiumSchImageRecord3) continue;
@@ -4523,6 +4611,7 @@ function createSchematicConversionContext({
     throw new RangeError("schematicUnitScale must be a positive finite number");
   }
   return {
+    convertedPorts: [],
     document,
     elements: [],
     handledRecords: /* @__PURE__ */ new Set(),