altium-toolkit 1.1.22 → 1.1.23

package/src/core/altium/PcbLayerStackReadModelBuilder.mjs

@@ -62,6 +62,7 @@ export class PcbLayerStackReadModelBuilder {
             layerById,
             'backdrill'
         )
+        const stackup = PcbLayerStackReadModelBuilder.#stackup(fields)
         const diagnostics = PcbLayerStackReadModelBuilder.#diagnostics({
             substacks,
             branches,
@@ -105,6 +106,7 @@ export class PcbLayerStackReadModelBuilder {
             branches,
             topLevelBendLines,
             cavityReport,
+            ...(stackup ? { stackup } : {}),
             impedanceProfiles,
             transmissionLines,
             viaSpans,
@@ -166,9 +168,9 @@ export class PcbLayerStackReadModelBuilder {
                 PcbLayerStackReadModelBuilder.#stripUndefined({
                     index: layer.index,
                     layerId: layer.layerId,
-                    layerKey: PcbLayerStackReadModelBuilder.#layerKey(
-                        layer.layerId
-                    ),
+                    layerKey: Number.isFinite(layer.layerId)
+                        ? 'L' + layer.layerId
+                        : undefined,
                     name: layer.name,
                     kind: layer.kind,
                     material: layer.material,
@@ -189,9 +191,9 @@ export class PcbLayerStackReadModelBuilder {
             PcbLayerStackReadModelBuilder.#stripUndefined({
                 index: index + 1,
                 layerId: layer.layerId,
-                layerKey: PcbLayerStackReadModelBuilder.#layerKey(
-                    layer.layerId
-                ),
+                layerKey: Number.isFinite(layer.layerId)
+                    ? 'L' + layer.layerId
+                    : undefined,
                 name: layer.name,
                 kind: layer.kind || layer.role,
                 ...PcbLayerStackSourceMetadataParser.layerSourceFields(
@@ -592,6 +594,81 @@ export class PcbLayerStackReadModelBuilder {
         )
     }
 
+    /**
+     * Parses document-level layer-stack metadata.
+     * @param {Record<string, string | string[]>} fields Board fields.
+     * @returns {object | undefined}
+     */
+    static #stackup(fields) {
+        const features = PcbLayerStackReadModelBuilder.#stackupFeatures(fields)
+        const stackup = PcbLayerStackReadModelBuilder.#stripUndefined({
+            serializerVersion: PcbLayerStackReadModelBuilder.#field(
+                fields,
+                'STACKUPX_SERIALIZER_VERSION'
+            ),
+            revisionId: PcbLayerStackReadModelBuilder.#field(
+                fields,
+                'STACKUPX_REVISION_ID'
+            ),
+            type: PcbLayerStackReadModelBuilder.#field(fields, 'STACKUPX_TYPE'),
+            roughnessType: PcbLayerStackReadModelBuilder.#field(
+                fields,
+                'STACKUPX_ROUGHNESS_TYPE'
+            ),
+            roughnessFactorSR: PcbLayerStackReadModelBuilder.#field(
+                fields,
+                'STACKUPX_ROUGHNESS_FACTOR_SR'
+            ),
+            roughnessFactor: PcbLayerStackReadModelBuilder.#field(
+                fields,
+                'STACKUPX_ROUGHNESS_FACTOR'
+            ),
+            realisticRatio: PcbLayerStackReadModelBuilder.#optionalBoolean(
+                PcbLayerStackReadModelBuilder.#field(
+                    fields,
+                    'STACKUPX_REALISTIC_RATIO'
+                )
+            ),
+            features: PcbLayerStackSourceMetadataParser.optionalArray(features)
+        })
+
+        return Object.keys(stackup).length ? stackup : undefined
+    }
+
+    /**
+     * Parses stackup feature rows.
+     * @param {Record<string, string | string[]>} fields Board fields.
+     * @returns {object[]}
+     */
+    static #stackupFeatures(fields) {
+        return PcbLayerStackReadModelBuilder.#indexedRows(fields, [
+            /^STACKUPX_FEATURE(\d+)_ID$/iu,
+            /^STACKUP_FEATURE(\d+)_ID$/iu
+        ]).map((index) =>
+            PcbLayerStackReadModelBuilder.#stripUndefined({
+                index,
+                id: PcbLayerStackReadModelBuilder.#indexedField(
+                    fields,
+                    ['STACKUPX_FEATURE', 'STACKUP_FEATURE'],
+                    index,
+                    ['ID']
+                ),
+                name: PcbLayerStackReadModelBuilder.#indexedField(
+                    fields,
+                    ['STACKUPX_FEATURE', 'STACKUP_FEATURE'],
+                    index,
+                    ['NAME']
+                ),
+                kind: PcbLayerStackReadModelBuilder.#indexedField(
+                    fields,
+                    ['STACKUPX_FEATURE', 'STACKUP_FEATURE'],
+                    index,
+                    ['KIND']
+                )
+            })
+        )
+    }
+
     /**
      * Builds preservation-first diagnostics for unresolved references.
      * @param {object} input Sidecar sections.
@@ -903,15 +980,6 @@ export class PcbLayerStackReadModelBuilder {
         return Number.isFinite(parsed) ? parsed : undefined
     }
 
-    /**
-     * Builds a stable layer key.
-     * @param {number | null | undefined} layerId Layer id.
-     * @returns {string | undefined}
-     */
-    static #layerKey(layerId) {
-        return Number.isFinite(layerId) ? 'L' + layerId : undefined
-    }
-
     /**
      * Removes undefined and empty string values while keeping false and empty
      * arrays stable.

package/src/core/altium/PcbLayerStackSourceMetadataParser.mjs

@@ -53,6 +53,50 @@ export class PcbLayerStackSourceMetadataParser {
                 'COVERLAYEXPANSION',
                 'COVERLAY_EXPANSION'
             ]),
+            process: layerField(['PROCESS']),
+            pullbackDistance: layerField([
+                'PULLBACKDISTANCE',
+                'PULLBACK_DISTANCE'
+            ]),
+            copperOrientation: layerField([
+                'COPPERORIENTATION',
+                'COPPER_ORIENTATION'
+            ]),
+            orientation: layerField(['ORIENTATION']),
+            note: layerField(['NOTE']),
+            comment: layerField(['COMMENT']),
+            materialManufacturer: layerField([
+                'MATERIALMANUFACTURER',
+                'MATERIAL_MANUFACTURER'
+            ]),
+            materialDescription: layerField([
+                'MATERIALDESCRIPTION',
+                'MATERIAL_DESCRIPTION'
+            ]),
+            materialGlassTransitionTemp: layerField([
+                'MATERIALGLASSTRANSITIONTEMP',
+                'MATERIAL_GLASS_TRANSITION_TEMP'
+            ]),
+            glassTransitionTemp: layerField([
+                'GLASSTRANSITIONTEMP',
+                'GLASS_TRANSITION_TEMP'
+            ]),
+            dielectricStrength: layerField([
+                'DIELECTRICSTRENGTH',
+                'DIELECTRIC_STRENGTH'
+            ]),
+            volumeResistivity: layerField([
+                'VOLUMERESISTIVITY',
+                'VOLUME_RESISTIVITY'
+            ]),
+            resin: layerField(['RESIN']),
+            solid: layerField(['SOLID']),
+            materialFrequency: layerField([
+                'MATERIALFREQUENCY',
+                'MATERIAL_FREQUENCY'
+            ]),
+            frequency: layerField(['FREQUENCY']),
+            constructions: layerField(['CONSTRUCTIONS']),
             isStiffener: PcbLayerStackSourceMetadataParser.#optionalBoolean(
                 layerField(['ISSTIFFENER', 'IS_STIFFENER'])
             ),
@@ -235,10 +279,17 @@ export class PcbLayerStackSourceMetadataParser {
      * @returns {object[]}
      */
     static #substackEnablement(fields, layerIndex) {
-        const pattern = new RegExp(
-            '^V9_STACK_LAYER' + layerIndex + '_SUBSTACK(\\d+)_ENABLED$',
-            'iu'
-        )
+        const prefix = 'V9_STACK_LAYER' + layerIndex + '_SUBSTACK'
+        if (
+            !PcbLayerStackSourceMetadataParser.#hasCaseInsensitivePrefix(
+                fields,
+                prefix
+            )
+        ) {
+            return []
+        }
+
+        const pattern = new RegExp('^' + prefix + '(\\d+)_ENABLED$', 'iu')
 
         return Object.keys(fields)
             .flatMap((key) => {
@@ -261,6 +312,25 @@ export class PcbLayerStackSourceMetadataParser {
             .sort((left, right) => left.substackIndex - right.substackIndex)
     }
 
+    /**
+     * Returns true when any field key starts with a prefix, ignoring case.
+     * @param {Record<string, string | string[]>} fields Source fields.
+     * @param {string} prefix Field-key prefix.
+     * @returns {boolean}
+     */
+    static #hasCaseInsensitivePrefix(fields, prefix) {
+        const upperPrefix = prefix.toUpperCase()
+        for (const key of PcbLayerStackSourceMetadataParser.#fieldIndex(
+            fields
+        ).keys()) {
+            if (key.startsWith(upperPrefix)) {
+                return true
+            }
+        }
+
+        return false
+    }
+
     /**
      * Parses branch-section stack rows.
      * @param {Record<string, string | string[]>} fields Board fields.

package/src/core/altium/PcbLibModelParser.mjs

@@ -20,7 +20,7 @@ export class PcbLibModelParser {
     /**
      * Parses one extracted PcbLib into a normalized read-only model.
      * @param {string} fileName
-     * @param {{ libraryHeader?: Record<string, string>, componentParamsToc?: Record<string, object>, sectionKeys?: Record<string, string>, footprints?: object[], embeddedFonts?: { fonts?: object[] }, streamNames?: string[], diagnostics?: Record<string, number> } | null} extraction
+     * @param {{ libraryHeader?: Record<string, string>, componentParamsToc?: Record<string, object>, sectionKeys?: Record<string, string>, footprints?: object[], embeddedFonts?: { fonts?: object[] }, nativeStreams?: object, streamNames?: string[], diagnostics?: Record<string, number> } | null} extraction
      * @returns {{ schema: string, kind: 'pcb-library', fileType: 'PcbLib', fileName: string, summary: Record<string, number | string>, diagnostics: { severity: 'info' | 'warning', message: string }[], pcbLibrary: { libraryHeader: Record<string, string>, componentParamsToc: Record<string, object>, sectionKeys: Record<string, string>, footprints: object[], embeddedFonts: object[] }, bom: [] }}
      */
     static parse(fileName, extraction) {
@@ -54,7 +54,8 @@ export class PcbLibModelParser {
             fileName,
             footprints,
             embeddedFonts,
-            embeddedModels
+            embeddedModels,
+            safeExtraction.nativeStreams
         )
         const diagnostics = PcbLibModelParser.#buildDiagnostics(
             footprints,
@@ -71,6 +72,9 @@ export class PcbLibModelParser {
             embeddedFonts,
             embeddedModels,
             componentBodies,
+            ...(safeExtraction.nativeStreams
+                ? { nativeStreams: safeExtraction.nativeStreams }
+                : {}),
             ...(defaults ? { defaults } : {})
         }
         pcbLibrary.renderManifest =
@@ -94,9 +98,16 @@ export class PcbLibModelParser {
      * @param {object[]} footprints
      * @param {object[]} embeddedFonts
      * @param {object[]} embeddedModels
+     * @param {object | undefined} nativeStreams Native stream inventory.
      * @returns {Record<string, number | string>}
      */
-    static #buildSummary(fileName, footprints, embeddedFonts, embeddedModels) {
+    static #buildSummary(
+        fileName,
+        footprints,
+        embeddedFonts,
+        embeddedModels,
+        nativeStreams
+    ) {
         return {
             title: stripExtension(fileName),
             footprintCount: footprints.length,
@@ -116,7 +127,12 @@ export class PcbLibModelParser {
                 'rawRecords'
             ),
             embeddedFontCount: embeddedFonts.length,
-            embeddedModelCount: embeddedModels.length
+            embeddedModelCount: embeddedModels.length,
+            ...(nativeStreams?.summary?.streamCount
+                ? {
+                      nativeStreamCount: nativeStreams.summary.streamCount
+                  }
+                : {})
         }
     }
 

package/src/core/altium/PcbLibStreamExtractor.mjs

@@ -7,6 +7,7 @@ import { PcbCustomPadShapeParser } from './PcbCustomPadShapeParser.mjs'
 import { PcbEmbeddedFontExtractor } from './PcbEmbeddedFontExtractor.mjs'
 import { PcbEmbeddedModelExtractor } from './PcbEmbeddedModelExtractor.mjs'
 import { PcbExtendedPrimitiveInformationParser } from './PcbExtendedPrimitiveInformationParser.mjs'
+import { NativeStreamInventoryBuilder } from './NativeStreamInventoryBuilder.mjs'
 import { PcbRawRecordRegistry } from './PcbRawRecordRegistry.mjs'
 import { OleCompoundDocument } from '../ole/OleCompoundDocument.mjs'
 import { OleConstants } from '../ole/OleConstants.mjs'
@@ -164,18 +165,29 @@ export class PcbLibStreamExtractor {
             PcbEmbeddedFontExtractor.extractFromStreams(streams)
         const embeddedModels =
             PcbEmbeddedModelExtractor.extractFromStreams(streams)
+        const usedStreamNames = PcbLibStreamExtractor.#collectUsedStreamNames(
+            footprints,
+            streams,
+            embeddedFonts,
+            embeddedModels
+        )
+        const nativeStreams = NativeStreamInventoryBuilder.buildFromStreams(
+            streams,
+            {
+                source: 'pcblib',
+                consumedStreamNames: usedStreamNames,
+                knownStreamNames:
+                    PcbLibStreamExtractor.#knownStreamNames(streams)
+            }
+        )
 
         return {
             libraryHeader: parsedLibraryData.libraryHeader,
             componentParamsToc,
             sectionKeys,
             footprints,
-            streamNames: PcbLibStreamExtractor.#collectUsedStreamNames(
-                footprints,
-                streams,
-                embeddedFonts,
-                embeddedModels
-            ),
+            streamNames: usedStreamNames,
+            nativeStreams,
             embeddedFonts,
             embeddedModels,
             diagnostics: {
@@ -999,6 +1011,37 @@ export class PcbLibStreamExtractor {
         return [...names].sort((left, right) => left.localeCompare(right))
     }
 
+    /**
+     * Builds recognized PcbLib stream names from one stream map.
+     * @param {Map<string, Uint8Array>} streams Native stream map.
+     * @returns {string[]}
+     */
+    static #knownStreamNames(streams) {
+        return [...(streams || new Map()).keys()].filter((streamName) => {
+            if (
+                [
+                    'Library/Data',
+                    'Library/ComponentParamsTOC/Data',
+                    'SectionKeys'
+                ].includes(streamName)
+            ) {
+                return true
+            }
+
+            const leafName = String(streamName || '')
+                .split('/')
+                .at(-1)
+            return [
+                'Header',
+                'Data',
+                'Parameters',
+                'WideStrings',
+                'ExtendedPrimitiveInformation',
+                'CustomShapes'
+            ].includes(leafName)
+        })
+    }
+
     /**
      * Sanitizes one footprint name for legacy OLE storage lookup.
      * @param {string} name