altium-toolkit 1.0.8 → 1.0.10

package/src/core/circuit-json/CircuitJsonModelAdapter.mjs

@@ -4,8 +4,10 @@
 
 import { CircuitJsonModelSchema } from './CircuitJsonModelSchema.mjs'
 import { CircuitJsonModelAdapterPrimitives } from './CircuitJsonModelAdapterPrimitives.mjs'
+import { CircuitJsonModelAdapterPcbElements } from './CircuitJsonModelAdapterPcbElements.mjs'
 
 const Primitives = CircuitJsonModelAdapterPrimitives
+const PcbElements = CircuitJsonModelAdapterPcbElements
 
 /**
  * Converts between legacy renderer models and Circuit JSON element arrays.
@@ -175,7 +177,8 @@ export class CircuitJsonModelAdapter {
                     width: Primitives.number(component.width, 0),
                     height: Primitives.number(component.height, 0)
                 },
-                rotation: Primitives.number(component.rotation, 0)
+                rotation: Primitives.number(component.rotation, 0),
+                is_box_with_pins: true
             })
         }
 
@@ -204,9 +207,8 @@ export class CircuitJsonModelAdapter {
                     pin.name || pin.designator || pinIndex,
                     String(pinIndex + 1)
                 ),
-                pin_number: Primitives.string(
-                    pin.pinNumber || pin.designator || pin.name,
-                    String(pinIndex + 1)
+                ...CircuitJsonModelAdapter.#pinNumberField(
+                    pin.pinNumber || pin.designator || pin.name
                 )
             })
             circuitJson.push({
@@ -232,7 +234,8 @@ export class CircuitJsonModelAdapter {
             circuitJson.push({
                 type: 'source_net',
                 source_net_id: sourceNetId,
-                name: Primitives.string(net.name, `NET_${netIndex + 1}`)
+                name: Primitives.string(net.name, `NET_${netIndex + 1}`),
+                member_source_group_ids: []
             })
         }
 
@@ -269,7 +272,7 @@ export class CircuitJsonModelAdapter {
      */
     static #appendPcb(circuitJson, model, idScope) {
         const pcb = model.pcb || {}
-        const componentIds = new Map()
+        const componentRefs = new Map()
         const sourceNetIds = new Map()
         const boardId = Primitives.id(idScope, ['pcb_board'])
 
@@ -295,7 +298,8 @@ export class CircuitJsonModelAdapter {
                 name: Primitives.string(
                     net.name || net.netName,
                     `NET_${netIndex + 1}`
-                )
+                ),
+                member_source_group_ids: []
             })
         }
 
@@ -310,9 +314,12 @@ export class CircuitJsonModelAdapter {
                 'pcb_component',
                 component.designator || component.name || componentIndex
             ])
-            componentIds.set(
+            componentRefs.set(
                 Primitives.componentKey(component, componentIndex),
-                sourceComponentId
+                {
+                    pcbComponentId,
+                    sourceComponentId
+                }
             )
             circuitJson.push(
                 CircuitJsonModelAdapter.#sourceComponent(
@@ -345,7 +352,7 @@ export class CircuitJsonModelAdapter {
                 idScope,
                 pad,
                 padIndex,
-                componentIds,
+                componentRefs,
                 sourceNetIds
             )
         }
@@ -367,8 +374,7 @@ export class CircuitJsonModelAdapter {
                 circuitJson,
                 idScope,
                 via,
-                viaIndex,
-                sourceNetIds
+                viaIndex
             )
         }
     }
@@ -415,7 +421,7 @@ export class CircuitJsonModelAdapter {
      * @param {string} idScope
      * @param {Record<string, unknown>} pad
      * @param {number} padIndex
-     * @param {Map<string, string>} componentIds
+     * @param {Map<string, { pcbComponentId: string, sourceComponentId: string }>} componentRefs
      * @param {Map<string, string>} sourceNetIds
      * @returns {void}
      */
@@ -424,12 +430,14 @@ export class CircuitJsonModelAdapter {
         idScope,
         pad,
         padIndex,
-        componentIds,
+        componentRefs,
         sourceNetIds
     ) {
+        const componentRef =
+            componentRefs.get(String(pad.componentIndex)) ||
+            componentRefs.get('0')
         const sourceComponentId =
-            componentIds.get(String(pad.componentIndex)) ||
-            componentIds.get('0') ||
+            componentRef?.sourceComponentId ||
             Primitives.id(idScope, ['source_component', 'unassigned'])
         const sourcePortId = Primitives.sourcePortId(
             idScope,
@@ -438,69 +446,74 @@ export class CircuitJsonModelAdapter {
             sourceComponentId
         )
         const pcbPortId = Primitives.id(idScope, ['pcb_port', sourcePortId])
-        const common = {
-            source_port_id: sourcePortId,
-            pcb_port_id: pcbPortId,
-            pcb_component_id: Primitives.id(idScope, [
-                'pcb_component',
-                pad.componentIndex ?? 'unassigned'
-            ]),
-            center: Primitives.milPoint(pad.x, pad.y),
-            layer: Primitives.side(pad.layer),
-            port_hints: [
-                Primitives.string(
-                    pad.name || pad.pinName || pad.designator,
-                    String(padIndex + 1)
-                )
-            ]
-        }
-        const sourceNetId = Primitives.netIdForPrimitive(
-            idScope,
-            pad,
-            sourceNetIds
-        )
+        const pcbComponentId =
+            componentRef?.pcbComponentId ||
+            Primitives.id(idScope, ['pcb_component', 'unassigned'])
+        const center = Primitives.milPoint(pad.x, pad.y)
+        const layer = Primitives.side(pad.layer)
+        const portHints = [
+            Primitives.string(
+                pad.name || pad.pinName || pad.designator,
+                String(padIndex + 1)
+            )
+        ]
+        Primitives.netIdForPrimitive(idScope, pad, sourceNetIds)
 
         circuitJson.push({
             type: 'source_port',
             source_port_id: sourcePortId,
             source_component_id: sourceComponentId,
-            name: common.port_hints[0],
-            pin_number: common.port_hints[0]
+            name: portHints[0],
+            port_hints: portHints,
+            ...CircuitJsonModelAdapter.#pinNumberField(portHints[0])
         })
         circuitJson.push({
             type: 'pcb_port',
-            ...common,
-            source_net_id: sourceNetId
+            pcb_port_id: pcbPortId,
+            source_port_id: sourcePortId,
+            pcb_component_id: pcbComponentId,
+            x: center.x,
+            y: center.y,
+            layers: Primitives.isThroughHolePad(pad)
+                ? ['top', 'bottom']
+                : [layer]
         })
 
         if (Primitives.isThroughHolePad(pad)) {
-            circuitJson.push({
-                type: pad.isPlated === false ? 'pcb_hole' : 'pcb_plated_hole',
-                ...common,
-                outer_diameter: Primitives.milNumber(
-                    pad.sizeTopX || pad.sizeX || pad.diameter,
-                    0
-                ),
-                hole_diameter: Primitives.milNumber(pad.holeDiameter, 0),
-                shape: Primitives.padShape(pad)
-            })
+            circuitJson.push(
+                pad.isPlated === false
+                    ? PcbElements.hole(
+                          idScope,
+                          pad,
+                          padIndex,
+                          pcbComponentId,
+                          center
+                      )
+                    : PcbElements.platedHole(
+                          idScope,
+                          pad,
+                          padIndex,
+                          pcbComponentId,
+                          pcbPortId,
+                          center,
+                          portHints
+                      )
+            )
             return
         }
 
-        circuitJson.push({
-            type: 'pcb_smtpad',
-            ...common,
-            shape: Primitives.padShape(pad),
-            width: Primitives.milNumber(
-                pad.sizeTopX || pad.sizeX || pad.width,
-                0
-            ),
-            height: Primitives.milNumber(
-                pad.sizeTopY || pad.sizeY || pad.height,
-                0
-            ),
-            rotation: Primitives.number(pad.rotation || pad.holeRotation, 0)
-        })
+        circuitJson.push(
+            PcbElements.smtPad(
+                idScope,
+                pad,
+                padIndex,
+                pcbComponentId,
+                pcbPortId,
+                center,
+                layer,
+                portHints
+            )
+        )
     }
 
     /**
@@ -523,14 +536,16 @@ export class CircuitJsonModelAdapter {
             'source_trace',
             track.netName || track.netIndex || trackIndex
         ])
+        const sourceNetId = Primitives.netIdForPrimitive(
+            idScope,
+            track,
+            sourceNetIds
+        )
         circuitJson.push({
             type: 'source_trace',
             source_trace_id: sourceTraceId,
-            source_net_id: Primitives.netIdForPrimitive(
-                idScope,
-                track,
-                sourceNetIds
-            )
+            connected_source_port_ids: [],
+            connected_source_net_ids: sourceNetId ? [sourceNetId] : []
         })
         circuitJson.push({
             type: 'pcb_trace',
@@ -561,18 +576,12 @@ export class CircuitJsonModelAdapter {
      * @param {string} idScope
      * @param {Record<string, unknown>} via
      * @param {number} viaIndex
-     * @param {Map<string, string>} sourceNetIds
      * @returns {void}
      */
-    static #appendPcbVia(circuitJson, idScope, via, viaIndex, sourceNetIds) {
+    static #appendPcbVia(circuitJson, idScope, via, viaIndex) {
         circuitJson.push({
             type: 'pcb_via',
             pcb_via_id: Primitives.id(idScope, ['pcb_via', viaIndex]),
-            source_net_id: Primitives.netIdForPrimitive(
-                idScope,
-                via,
-                sourceNetIds
-            ),
             x: Primitives.milNumber(via.x, 0),
             y: Primitives.milNumber(via.y, 0),
             outer_diameter: Primitives.milNumber(via.diameter, 0),
@@ -664,33 +673,47 @@ export class CircuitJsonModelAdapter {
             x2: Primitives.number(line.x2, 0),
             y2: Primitives.number(line.y2, 0),
             stroke_width: Primitives.number(line.width, 1),
-            is_dashed: line.dashed === true
+            is_dashed: line.dashed === true,
+            color: '#000000'
         }
         circuitJson.push(lineElement)
 
         if (line.kind === 'wire' || line.netName || line.netIndex) {
+            const sourceNetId =
+                netIds.get(String(line.netName)) ||
+                Primitives.sourceNetId(
+                    idScope,
+                    line.netName || line.netIndex || lineIndex
+                )
+            const sourceTraceId = Primitives.id(idScope, [
+                'source_trace',
+                line.netName || line.netIndex || lineIndex,
+                lineIndex
+            ])
+            circuitJson.push({
+                type: 'source_trace',
+                source_trace_id: sourceTraceId,
+                connected_source_port_ids: [],
+                connected_source_net_ids: sourceNetId ? [sourceNetId] : []
+            })
             circuitJson.push({
                 type: 'schematic_trace',
                 schematic_trace_id: Primitives.id(idScope, [
                     'schematic_trace',
                     lineIndex
                 ]),
-                source_trace_id: Primitives.id(idScope, [
-                    'source_trace',
-                    line.netName || line.netIndex || lineIndex
-                ]),
-                source_net_id:
-                    netIds.get(String(line.netName)) ||
-                    Primitives.sourceNetId(
-                        idScope,
-                        line.netName || line.netIndex || lineIndex
-                    ),
+                source_trace_id: sourceTraceId,
+                junctions: [],
                 edges: [
                     {
-                        x1: lineElement.x1,
-                        y1: lineElement.y1,
-                        x2: lineElement.x2,
-                        y2: lineElement.y2
+                        from: {
+                            x: lineElement.x1,
+                            y: lineElement.y1
+                        },
+                        to: {
+                            x: lineElement.x2,
+                            y: lineElement.y2
+                        }
                     }
                 ]
             })
@@ -712,11 +735,11 @@ export class CircuitJsonModelAdapter {
         )
         const base = {
             text: textValue,
-            anchor_position: Primitives.point(text.x, text.y),
-            anchor_alignment: 'center'
+            position: Primitives.point(text.x, text.y)
         }
 
         if (Primitives.isNetLabel(text)) {
+            const center = Primitives.point(text.x, text.y)
             circuitJson.push({
                 type: 'schematic_net_label',
                 schematic_net_label_id: Primitives.id(idScope, [
@@ -727,7 +750,10 @@ export class CircuitJsonModelAdapter {
                     idScope,
                     textValue || textIndex
                 ),
-                ...base
+                text: textValue,
+                center,
+                anchor_position: center,
+                anchor_side: 'top'
             })
             return
         }
@@ -738,10 +764,24 @@ export class CircuitJsonModelAdapter {
                 'schematic_text',
                 textIndex
             ]),
-            ...base
+            ...base,
+            font_size: Primitives.number(text.fontSize || text.size, 0.18),
+            rotation: Primitives.number(text.rotation, 0),
+            anchor: 'center',
+            color: '#000000'
         })
     }
 
+    /**
+     * Returns an optional numeric pin number field.
+     * @param {unknown} value
+     * @returns {{ pin_number?: number }}
+     */
+    static #pinNumberField(value) {
+        const pinNumber = Primitives.number(value, null)
+        return pinNumber === null ? {} : { pin_number: pinNumber }
+    }
+
     /**
      * Returns a source component id for one schematic pin.
      * @param {Record<string, unknown>} pin

package/src/core/circuit-json/CircuitJsonModelAdapterPcbElements.mjs

@@ -0,0 +1,244 @@
+// SPDX-FileCopyrightText: 2026 André Fiedler
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import { CircuitJsonModelAdapterPrimitives } from './CircuitJsonModelAdapterPrimitives.mjs'
+
+const Primitives = CircuitJsonModelAdapterPrimitives
+
+/**
+ * Builds upstream-compatible Circuit JSON PCB element records.
+ */
+export class CircuitJsonModelAdapterPcbElements {
+    /**
+     * Builds an upstream-compatible SMT pad element.
+     * @param {string} idScope
+     * @param {Record<string, unknown>} pad
+     * @param {number} padIndex
+     * @param {string} pcbComponentId
+     * @param {string} pcbPortId
+     * @param {{ x: number, y: number }} center
+     * @param {string} layer
+     * @param {string[]} portHints
+     * @returns {object}
+     */
+    static smtPad(
+        idScope,
+        pad,
+        padIndex,
+        pcbComponentId,
+        pcbPortId,
+        center,
+        layer,
+        portHints
+    ) {
+        const shape = Primitives.padShape(pad)
+        const width = Primitives.milNumber(
+            pad.sizeTopX || pad.sizeX || pad.width,
+            0
+        )
+        const height = Primitives.milNumber(
+            pad.sizeTopY || pad.sizeY || pad.height,
+            0
+        )
+        const rotation = Primitives.number(pad.rotation || pad.holeRotation, 0)
+        const base = {
+            type: 'pcb_smtpad',
+            pcb_smtpad_id: Primitives.id(idScope, ['pcb_smtpad', padIndex]),
+            pcb_component_id: pcbComponentId,
+            pcb_port_id: pcbPortId,
+            x: center.x,
+            y: center.y,
+            layer,
+            port_hints: portHints
+        }
+
+        if (shape === 'circle') {
+            return {
+                ...base,
+                shape,
+                radius: Primitives.round(Math.max(width, height) / 2)
+            }
+        }
+
+        if (shape === 'pill') {
+            return {
+                ...base,
+                shape: CircuitJsonModelAdapterPcbElements.#hasRotation(rotation)
+                    ? 'rotated_pill'
+                    : 'pill',
+                width,
+                height,
+                radius: Primitives.round(Math.min(width, height) / 2),
+                ...CircuitJsonModelAdapterPcbElements.#ccwRotationField(
+                    rotation
+                )
+            }
+        }
+
+        return {
+            ...base,
+            shape: CircuitJsonModelAdapterPcbElements.#hasRotation(rotation)
+                ? 'rotated_rect'
+                : 'rect',
+            width,
+            height,
+            ...CircuitJsonModelAdapterPcbElements.#ccwRotationField(rotation)
+        }
+    }
+
+    /**
+     * Builds an upstream-compatible non-plated hole element.
+     * @param {string} idScope
+     * @param {Record<string, unknown>} pad
+     * @param {number} padIndex
+     * @param {string} pcbComponentId
+     * @param {{ x: number, y: number }} center
+     * @returns {object}
+     */
+    static hole(idScope, pad, padIndex, pcbComponentId, center) {
+        const shape = Primitives.padShape(pad)
+        const width = Primitives.milNumber(
+            pad.sizeTopX || pad.sizeX || pad.width || pad.diameter,
+            0
+        )
+        const height = Primitives.milNumber(
+            pad.sizeTopY || pad.sizeY || pad.height || pad.diameter,
+            0
+        )
+        const holeDiameter = Primitives.milNumber(pad.holeDiameter, 0)
+        const base = {
+            type: 'pcb_hole',
+            pcb_hole_id: Primitives.id(idScope, ['pcb_hole', padIndex]),
+            pcb_component_id: pcbComponentId,
+            x: center.x,
+            y: center.y
+        }
+
+        if (shape === 'circle') {
+            return {
+                ...base,
+                hole_shape: 'circle',
+                hole_diameter: holeDiameter
+            }
+        }
+
+        return {
+            ...base,
+            hole_shape: shape === 'pill' ? 'pill' : 'rect',
+            hole_width: holeDiameter || width,
+            hole_height: holeDiameter || height
+        }
+    }
+
+    /**
+     * Builds an upstream-compatible plated hole element.
+     * @param {string} idScope
+     * @param {Record<string, unknown>} pad
+     * @param {number} padIndex
+     * @param {string} pcbComponentId
+     * @param {string} pcbPortId
+     * @param {{ x: number, y: number }} center
+     * @param {string[]} portHints
+     * @returns {object}
+     */
+    static platedHole(
+        idScope,
+        pad,
+        padIndex,
+        pcbComponentId,
+        pcbPortId,
+        center,
+        portHints
+    ) {
+        const shape = Primitives.padShape(pad)
+        const width = Primitives.milNumber(
+            pad.sizeTopX || pad.sizeX || pad.width || pad.diameter,
+            0
+        )
+        const height = Primitives.milNumber(
+            pad.sizeTopY || pad.sizeY || pad.height || pad.diameter,
+            0
+        )
+        const holeDiameter = Primitives.milNumber(pad.holeDiameter, 0)
+        const rotation = Primitives.number(pad.rotation || pad.holeRotation, 0)
+        const base = {
+            type: 'pcb_plated_hole',
+            pcb_plated_hole_id: Primitives.id(idScope, [
+                'pcb_plated_hole',
+                padIndex
+            ]),
+            pcb_component_id: pcbComponentId,
+            pcb_port_id: pcbPortId,
+            x: center.x,
+            y: center.y,
+            layers: ['top', 'bottom'],
+            port_hints: portHints
+        }
+
+        if (shape === 'circle') {
+            return {
+                ...base,
+                shape,
+                outer_diameter: Primitives.round(Math.max(width, height)),
+                hole_diameter: holeDiameter
+            }
+        }
+
+        if (shape === 'pill') {
+            return {
+                ...base,
+                shape,
+                outer_width: width,
+                outer_height: height,
+                hole_width: holeDiameter,
+                hole_height: holeDiameter,
+                ccw_rotation: rotation
+            }
+        }
+
+        return {
+            ...base,
+            shape: 'circular_hole_with_rect_pad',
+            hole_shape: 'circle',
+            pad_shape: 'rect',
+            hole_diameter: holeDiameter,
+            rect_pad_width: width,
+            rect_pad_height: height,
+            ...CircuitJsonModelAdapterPcbElements.#rectCcwRotationField(
+                rotation
+            )
+        }
+    }
+
+    /**
+     * Returns true when a rotation value should use a rotated pad shape.
+     * @param {number | null} rotation
+     * @returns {boolean}
+     */
+    static #hasRotation(rotation) {
+        return Math.abs(rotation || 0) > 0.000001
+    }
+
+    /**
+     * Returns an optional counter-clockwise rotation field.
+     * @param {number | null} rotation
+     * @returns {{ ccw_rotation?: number }}
+     */
+    static #ccwRotationField(rotation) {
+        return CircuitJsonModelAdapterPcbElements.#hasRotation(rotation)
+            ? { ccw_rotation: rotation || 0 }
+            : {}
+    }
+
+    /**
+     * Returns an optional rectangular pad rotation field.
+     * @param {number | null} rotation
+     * @returns {{ rect_ccw_rotation?: number }}
+     */
+    static #rectCcwRotationField(rotation) {
+        return CircuitJsonModelAdapterPcbElements.#hasRotation(rotation)
+            ? { rect_ccw_rotation: rotation || 0 }
+            : {}
+    }
+}

package/src/core/circuit-json/CircuitJsonModelSchema.mjs

@@ -8,7 +8,7 @@
 export class CircuitJsonModelSchema {
     static CURRENT_SCHEMA_ID = 'https://github.com/tscircuit/circuit-json'
 
-    static CURRENT_SCHEMA_VERSION = '0.0.431'
+    static CURRENT_SCHEMA_VERSION = '0.0.433'
 
     static FORMAT_NAME = 'circuit-json'
 

package/src/core/ole/OleCompoundDocument.mjs

@@ -30,6 +30,7 @@ export class OleCompoundDocument {
     constructor(arrayBuffer) {
         this.#reader = new BinaryReader(arrayBuffer)
         this.#header = this.#parseHeader()
+        this.#assertSectorAlignedFile()
         this.#fatEntries = this.#parseFatEntries()
         this.#directoryEntries = this.#parseDirectoryEntries()
         this.#miniFatEntries = this.#parseMiniFatEntries()
@@ -137,6 +138,25 @@ export class OleCompoundDocument {
         }
     }
 
+    /**
+     * Ensures the byte stream still matches the OLE sector grid.
+     */
+    #assertSectorAlignedFile() {
+        const payloadByteLength =
+            this.#reader.byteLength - OleConstants.HEADER_BYTE_LENGTH
+
+        if (
+            payloadByteLength < 0 ||
+            payloadByteLength % this.#header.sectorByteLength !== 0
+        ) {
+            throw new Error(
+                'OLE compound document byte length is not sector-aligned. ' +
+                    'The file may be truncated or line-ending normalized; ' +
+                    'keep Altium binary files committed and served as binary.'
+            )
+        }
+    }
+
     /**
      * Parses all FAT entries.
      * @returns {number[]}