@vessel-dsp/core 0.6.0 → 0.6.2

package/{src/formats/circuit-json/serializer.ts → dist/formats/circuit-json/serializer.js}

@@ -1,170 +1,15 @@
-import {
-    any_circuit_element,
-    type AnyCircuitElement,
-    type AnyCircuitElementInput,
-    type CircuitJson as OfficialCircuitJson,
-} from 'circuit-json';
-import { getPinNode, resolveConnectivity, type Connectivity, type NodeId } from '../../model/connectivity';
-import { propertyQuantityValue, propertyStringValue } from '../../model/properties';
-import { parseQuantity } from '../../model/quantity';
-import type {
-    CircuitDocument,
-    Component,
-    ComponentKind,
-    ParsedQuantity,
-    Point,
-    PropertyValue,
-    Rotation,
-    Terminal,
-    Warning,
-    Wire,
-} from '../../model/types';
-
-export type CircuitJsonExportTarget = 'tscircuit';
-
-export type CircuitJsonExportOptions = Readonly<{
-    target?: CircuitJsonExportTarget;
-}>;
-
-export type CircuitJsonSourceNet = Readonly<{
-    type: 'source_net';
-    source_net_id: string;
-    name: string;
-    member_source_group_ids: string[];
-    is_power?: boolean;
-    is_ground?: boolean;
-    is_digital_signal?: boolean;
-    is_analog_signal?: boolean;
-    is_positive_voltage_source?: boolean;
-}>;
-
-export type CircuitJsonSourceComponent = Readonly<{
-    type: 'source_component';
-    source_component_id: string;
-    name: string;
-    ftype?: string;
-    display_name?: string;
-    display_value?: string;
-    resistance?: number;
-    display_resistance?: string;
-    capacitance?: number;
-    display_capacitance?: string;
-    inductance?: number;
-    display_inductance?: string;
-    voltage?: number;
-    current?: number;
-    wave_shape?: 'dc' | 'sine' | 'square' | 'triangle' | 'sawtooth' | 'sinewave';
-    transistor_type?: 'npn' | 'pnp';
-    channel_type?: 'n' | 'p';
-    mosfet_mode?: 'enhancement' | 'depletion';
-    max_resistance?: number;
-    display_max_resistance?: string;
-    manufacturer_part_number?: string;
-}>;
-
-export type CircuitJsonSourcePort = Readonly<{
-    type: 'source_port';
-    source_port_id: string;
-    source_component_id: string;
-    name: string;
-    port_hints: string[];
-    provides_ground?: boolean;
-    requires_ground?: boolean;
-    provides_power?: boolean;
-    requires_power?: boolean;
-    provides_voltage?: number;
-}>;
-
-export type CircuitJsonSourceTrace = Readonly<{
-    type: 'source_trace';
-    source_trace_id: string;
-    connected_source_port_ids: string[];
-    connected_source_net_ids: string[];
-    display_name?: string;
-}>;
-
-export type CircuitJsonElement =
-    AnyCircuitElement;
-
-export type CircuitJson = OfficialCircuitJson;
-export type { AnyCircuitElement, AnyCircuitElementInput };
-
-export type CircuitJsonExport = Readonly<{
-    elements: CircuitJson;
-    warnings: readonly string[];
-}>;
-
-export type CircuitJsonSchemaValidationIssue = Readonly<{
-    code: 'circuit-json-schema-invalid';
-    message: string;
-    path?: string;
-}>;
-
-export type CircuitJsonSchemaValidationResult =
-    | Readonly<{
-        valid: true;
-        elements: CircuitJson;
-        errors: readonly [];
-    }>
-    | Readonly<{
-        valid: false;
-        errors: readonly CircuitJsonSchemaValidationIssue[];
-    }>;
-
-export type ParseCircuitJsonDocumentOptions = Readonly<{
-    filename?: string;
-}>;
-
-type JsonRecord = Readonly<Record<string, unknown>>;
-
-type SourceComponentRecord = Readonly<{
-    sourceComponentId: string;
-    componentId: string;
-    name: string;
-    ftype: string | null;
-    record: JsonRecord;
-}>;
-
-type SourcePortRecord = Readonly<{
-    sourcePortId: string;
-    componentSourceId: string;
-    terminalName: string;
-    record: JsonRecord;
-}>;
-
-type SchematicComponentRecord = Readonly<{
-    sourceComponentId: string;
-    center: Point;
-}>;
-
-type SchematicPortRecord = Readonly<{
-    sourcePortId: string;
-    center: Point;
-}>;
-
-type MutableComponentBuild = {
-    readonly sourceComponent: SourceComponentRecord;
-    readonly ports: readonly SourcePortRecord[];
-    readonly origin: Point;
-    readonly terminals: readonly Terminal[];
-};
-
-type QuantityLookup = Readonly<{
-    value: ParsedQuantity;
-}>;
-
-type QuantityKey = 'resistance' | 'capacitance' | 'inductance' | 'voltage' | 'current';
-type CircuitJsonSchematicPortDirection = 'up' | 'down' | 'left' | 'right';
-
-const VALUE_PROPERTY_NAMES: Readonly<Record<QuantityKey, readonly string[]>> = {
+import { any_circuit_element, } from 'circuit-json';
+import { getPinNode, resolveConnectivity } from '../../model/connectivity.js';
+import { propertyQuantityValue, propertyStringValue } from '../../model/properties.js';
+import { parseQuantity } from '../../model/quantity.js';
+const VALUE_PROPERTY_NAMES = {
     resistance: ['R', 'Resistance', 'resistance', 'value', 'Value'],
     capacitance: ['C', 'Capacitance', 'capacitance', 'value', 'Value'],
     inductance: ['L', 'Inductance', 'inductance', 'value', 'Value'],
     voltage: ['V', 'Voltage', 'voltage', 'value', 'Value'],
     current: ['I', 'Current', 'current', 'value', 'Value'],
 };
-
-const MODEL_PROPERTY_NAMES: readonly string[] = [
+const MODEL_PROPERTY_NAMES = [
     'manufacturerPartNumber',
     'ManufacturerPartNumber',
     'manufacturer_part_number',
@@ -175,8 +20,7 @@ const MODEL_PROPERTY_NAMES: readonly string[] = [
     'modelName',
     'ModelName',
 ];
-
-const DIRECT_EXPORT_KINDS: ReadonlySet<ComponentKind> = new Set<ComponentKind>([
+const DIRECT_EXPORT_KINDS = new Set([
     'resistor',
     'variable-resistor',
     'capacitor',
@@ -198,30 +42,26 @@ const DIRECT_EXPORT_KINDS: ReadonlySet<ComponentKind> = new Set<ComponentKind>([
     'port',
     'ic',
 ]);
-
-const SOURCE_ONLY_NET_NAME_KINDS: ReadonlySet<ComponentKind> = new Set<ComponentKind>([
+const SOURCE_ONLY_NET_NAME_KINDS = new Set([
     'label',
     'named-wire',
 ]);
-
+const VESSEL_CAN_CAP_SOURCE_GROUP_PREFIX = 'source_group:vessel-dsp-can-cap:';
+const VESSEL_DSP_PROPERTY_JSON_PREFIX = 'vessel-dsp-property-json:';
+const VESSEL_DSP_PROPERTY_SIDECAR_ID_PREFIX = 'vessel_dsp_property:';
 const TSCIRCUIT_SCHEMATIC_COORD_SCALE = 0.02;
 const DEFAULT_SCHEMATIC_COMPONENT_SIZE = { width: 1.2, height: 0.8 };
-
-export function serializeCircuitJsonDocument(
-    doc: CircuitDocument,
-    _options: CircuitJsonExportOptions = {},
-): CircuitJsonExport {
+export function serializeCircuitJsonDocument(doc, _options = {}) {
     const connectivity = resolveConnectivity(doc);
-    const warnings: string[] = [];
-    const exportedComponentIds = new Set<string>();
-    const sourcePortIdsByNode = new Map<NodeId, string[]>();
+    const warnings = [];
+    const exportedComponentIds = new Set();
+    const sourcePortIdsByNode = new Map();
     const names = netNames(doc, connectivity);
     const powerNodes = railNodeIds(doc, connectivity);
-
     const nets = sourceNetElements(connectivity, names, powerNodes);
-    const components: CircuitJsonSourceComponent[] = [];
-    const ports: CircuitJsonSourcePort[] = [];
-
+    const groups = sourceGroupElements(doc);
+    const components = [];
+    const ports = [];
     for (const component of doc.components) {
         const sourceComponent = sourceComponentElement(component, warnings);
         if (sourceComponent === null) {
@@ -229,7 +69,6 @@ export function serializeCircuitJsonDocument(
         }
         exportedComponentIds.add(component.id);
         components.push(sourceComponent);
-
         for (const terminal of component.terminals) {
             const nodeId = getPinNode(connectivity, {
                 componentId: component.id,
@@ -242,30 +81,27 @@ export function serializeCircuitJsonDocument(
             }
         }
     }
-
     const traces = sourceTraceElements(connectivity, names, sourcePortIdsByNode, warnings);
     warnings.push(...sourceOnlyWarnings(doc, exportedComponentIds));
-
-    const sourceElements = [...sourceProjectMetadataElements(doc), ...nets, ...components, ...ports, ...traces];
+    const sidecars = sourcePropertySidecarElements(doc, exportedComponentIds);
+    const sourceElements = [...sourceProjectMetadataElements(doc), ...nets, ...groups, ...components, ...ports, ...traces, ...sidecars];
     return {
         elements: normalizeCircuitJsonElements([...sourceElements, ...schematicElements(doc, traces)]),
         warnings,
     };
 }
-
-export function validateCircuitJsonDocument(source: unknown): CircuitJsonSchemaValidationResult {
+export function validateCircuitJsonDocument(source) {
     if (!Array.isArray(source)) {
         return {
             valid: false,
             errors: [{
-                code: 'circuit-json-schema-invalid',
-                message: 'Circuit JSON document must be an array of elements',
-            }],
+                    code: 'circuit-json-schema-invalid',
+                    message: 'Circuit JSON document must be an array of elements',
+                }],
         };
     }
-
-    const elements: AnyCircuitElement[] = [];
-    const errors: CircuitJsonSchemaValidationIssue[] = [];
+    const elements = [];
+    const errors = [];
     for (const [index, element] of source.entries()) {
         const shallowIssue = shallowSchemaIssue(element);
         if (shallowIssue !== null) {
@@ -287,32 +123,27 @@ export function validateCircuitJsonDocument(source: unknown): CircuitJsonSchemaV
             path: `[${index}]`,
         });
     }
-
     if (errors.length > 0) {
         return { valid: false, errors };
     }
     return { valid: true, elements, errors: [] };
 }
-
-export function parseCircuitJsonDocument(
-    source: unknown,
-    options: ParseCircuitJsonDocumentOptions = {},
-): CircuitDocument {
+export function parseCircuitJsonDocument(source, options = {}) {
     const result = validateCircuitJsonDocument(source);
     if (!result.valid) {
         throw new Error(result.errors.map((error) => `${error.path ?? '<root>'}: ${error.message}`).join('; '));
     }
-
-    const sourceComponents = new Map<string, SourceComponentRecord>();
-    const sourcePorts = new Map<string, SourcePortRecord>();
-    const schematicComponents = new Map<string, SchematicComponentRecord>();
-    const schematicPorts = new Map<string, SchematicPortRecord>();
-    const sourceTraces: JsonRecord[] = [];
-    const sourceNets = new Map<string, JsonRecord>();
-    const warnings: Warning[] = [];
-    const directives: string[] = [];
-    let metadataName: string | null = null;
-
+    const sourceComponents = new Map();
+    const sourcePorts = new Map();
+    const sourceGroups = new Map();
+    const sourcePropertySidecars = new Map();
+    const schematicComponents = new Map();
+    const schematicPorts = new Map();
+    const sourceTraces = [];
+    const sourceNets = new Map();
+    const warnings = [];
+    const directives = [];
+    let metadataName = null;
     for (const element of result.elements) {
         const record = checkedRecord(element);
         const type = stringField(record, 'type');
@@ -324,10 +155,37 @@ export function parseCircuitJsonDocument(
                     componentId: stripKnownPrefix(sourceComponentId, 'source_component:') ?? sanitizeId(stringField(record, 'name') ?? sourceComponentId),
                     name: stringField(record, 'name') ?? stripKnownPrefix(sourceComponentId, 'source_component:') ?? sourceComponentId,
                     ftype: stringField(record, 'ftype'),
+                    sourceGroupId: stringField(record, 'source_group_id'),
                     record,
                 });
                 break;
             }
+            case 'source_group': {
+                const sourceGroupId = requiredStringField(record, 'source_group_id');
+                sourceGroups.set(sourceGroupId, {
+                    sourceGroupId,
+                    name: stringField(record, 'name'),
+                });
+                break;
+            }
+            case 'source_property_ignored_warning': {
+                const sidecar = vesselDspPropertySidecar(record);
+                if (sidecar === null) {
+                    warnings.push({
+                        code: 'circuit-json-source-property-ignored',
+                        message: `Circuit JSON source property "${stringField(record, 'property_name') ?? ''}" was ignored`,
+                    });
+                    break;
+                }
+                const existing = sourcePropertySidecars.get(sidecar.sourceComponentId);
+                if (existing === undefined) {
+                    sourcePropertySidecars.set(sidecar.sourceComponentId, [sidecar]);
+                }
+                else {
+                    existing.push(sidecar);
+                }
+                break;
+            }
             case 'source_port': {
                 const sourcePortId = requiredStringField(record, 'source_port_id');
                 const componentSourceId = requiredStringField(record, 'source_component_id');
@@ -382,7 +240,6 @@ export function parseCircuitJsonDocument(
                 break;
         }
     }
-
     const portsByComponent = groupPortsByComponent(sourcePorts);
     const hasSchematicGeometry = schematicComponents.size > 0 || schematicPorts.size > 0;
     if (!hasSchematicGeometry && sourceComponents.size > 0) {
@@ -391,16 +248,15 @@ export function parseCircuitJsonDocument(
             message: 'Circuit JSON source elements did not include schematic geometry; generated deterministic component and terminal positions',
         });
     }
-
     const componentBuilds = Array.from(sourceComponents.values()).map((sourceComponent, index) => {
         const ports = portsByComponent.get(sourceComponent.sourceComponentId) ?? [];
-        return buildComponentFromCircuitJson(sourceComponent, ports, schematicComponents, schematicPorts, index);
+        const sidecars = sourcePropertySidecars.get(sourceComponent.sourceComponentId) ?? [];
+        return buildComponentFromCircuitJson(sourceComponent, ports, schematicComponents, schematicPorts, sourceGroups, sidecars, index);
     });
     const components = componentBuilds.map((build) => build.component);
     const terminalPositions = terminalPositionMap(componentBuilds);
     const wires = wireElementsFromSourceTraces(sourceTraces, terminalPositions);
     const netWarnings = warningsForUnconnectedNets(sourceNets, sourceTraces);
-
     return {
         metadata: {
             name: metadataName ?? filenameWithoutCircuitJsonExtension(options.filename ?? 'Circuit JSON Import'),
@@ -418,25 +274,18 @@ export function parseCircuitJsonDocument(
         rawAttributes: { format: 'circuit-json' },
     };
 }
-
-function sourceProjectMetadataElements(doc: CircuitDocument): AnyCircuitElement[] {
+function sourceProjectMetadataElements(doc) {
     if (doc.metadata.name.trim().length === 0) {
         return [];
     }
     return [{
-        type: 'source_project_metadata',
-        name: doc.metadata.name,
-        software_used_string: '@vessel-dsp/core',
-    }];
-}
-
-function sourceNetElements(
-    connectivity: Connectivity,
-    names: ReadonlyMap<NodeId, string>,
-    powerNodes: ReadonlySet<NodeId>,
-): readonly CircuitJsonSourceNet[] {
-    const elements: CircuitJsonSourceNet[] = [];
-
+            type: 'source_project_metadata',
+            name: doc.metadata.name,
+            software_used_string: '@vessel-dsp/core',
+        }];
+}
+function sourceNetElements(connectivity, names, powerNodes) {
+    const elements = [];
     for (let nodeId = 0; nodeId < connectivity.nodeCount; nodeId += 1) {
         const isGround = connectivity.groundNodeId === nodeId;
         const isPower = powerNodes.has(nodeId);
@@ -451,18 +300,28 @@ function sourceNetElements(
             is_analog_signal: true,
         });
     }
-
     return elements;
 }
-
-function sourceComponentElement(
-    component: Component,
-    warnings: string[],
-): CircuitJsonSourceComponent | null {
+function sourceGroupElements(doc) {
+    const byGroupId = new Map();
+    for (const component of doc.components) {
+        const groupId = canCapGroupProperty(component);
+        if (groupId === null || byGroupId.has(groupId)) {
+            continue;
+        }
+        const packageName = firstStringProperty(component, ['CanCapPackageName', 'PackageName']);
+        byGroupId.set(groupId, {
+            type: 'source_group',
+            source_group_id: canCapSourceGroupId(groupId),
+            show_as_schematic_box: true,
+            name: packageName ?? groupId,
+        });
+    }
+    return Array.from(byGroupId.values());
+}
+function sourceComponentElement(component, warnings) {
     if (component.kind === 'unsupported') {
-        warnings.push(
-            `${component.id} (unsupported): unsupported source type ${component.sourceTypeName ?? 'unknown'} skipped from Circuit JSON export`,
-        );
+        warnings.push(`${component.id} (unsupported): unsupported source type ${component.sourceTypeName ?? 'unknown'} skipped from Circuit JSON export`);
         return null;
     }
     if (SOURCE_ONLY_NET_NAME_KINDS.has(component.kind)) {
@@ -472,10 +331,8 @@ function sourceComponentElement(
         warnings.push(`${component.id} (${component.kind}): no Circuit JSON source-component mapping; skipped`);
         return null;
     }
-
     const base = sourceComponentBase(component);
     const manufacturerPartNumber = firstStringProperty(component, MODEL_PROPERTY_NAMES);
-
     switch (component.kind) {
         case 'resistor':
         case 'variable-resistor': {
@@ -540,9 +397,7 @@ function sourceComponentElement(
                 ...(manufacturerPartNumber !== null ? { manufacturer_part_number: manufacturerPartNumber } : {}),
             };
         case 'jfet':
-            warnings.push(
-                `${component.id} (jfet): Circuit JSON has no simple_jfet ftype; emitted simple_mosfet depletion-mode source metadata`,
-            );
+            warnings.push(`${component.id} (jfet): Circuit JSON has no simple_jfet ftype; emitted simple_mosfet depletion-mode source metadata`);
             return {
                 ...base,
                 ftype: 'simple_mosfet',
@@ -648,17 +503,96 @@ function sourceComponentElement(
             return null;
     }
 }
-
-function sourceComponentBase(component: Component): CircuitJsonSourceComponent {
+function sourceComponentBase(component) {
+    const groupId = canCapGroupProperty(component);
     return {
         type: 'source_component',
         source_component_id: sourceComponentId(component.id),
         name: component.name,
         display_name: component.name,
+        ...(groupId === null ? {} : { source_group_id: canCapSourceGroupId(groupId) }),
     };
 }
-
-function sourcePortElement(component: Component, terminalName: string): CircuitJsonSourcePort {
+function canCapGroupProperty(component) {
+    if (component.kind !== 'capacitor') {
+        return null;
+    }
+    const value = propertyStringValue(component.properties.CanCapGroupId);
+    return value === null || value.trim().length === 0 ? null : value.trim();
+}
+function canCapSourceGroupId(groupId) {
+    return `${VESSEL_CAN_CAP_SOURCE_GROUP_PREFIX}${groupId}`;
+}
+function canCapGroupIdFromSourceGroupId(sourceGroupId) {
+    return stripKnownPrefix(sourceGroupId, VESSEL_CAN_CAP_SOURCE_GROUP_PREFIX);
+}
+function sourcePropertySidecarElements(doc, exportedComponentIds) {
+    const sidecars = [];
+    for (const component of doc.components) {
+        if (!exportedComponentIds.has(component.id)) {
+            continue;
+        }
+        const consumed = circuitJsonConsumedPropertyKeys(component);
+        for (const [propertyName, value] of Object.entries(component.properties)) {
+            if (consumed.has(propertyName)) {
+                continue;
+            }
+            const sourceComponentIdValue = sourceComponentId(component.id);
+            sidecars.push({
+                type: 'source_property_ignored_warning',
+                source_property_ignored_warning_id: `${VESSEL_DSP_PROPERTY_SIDECAR_ID_PREFIX}${sourceComponentIdValue}:${propertyName}`,
+                source_component_id: sourceComponentIdValue,
+                property_name: propertyName,
+                error_type: 'source_property_ignored_warning',
+                message: `${VESSEL_DSP_PROPERTY_JSON_PREFIX}${stableJsonStringify({
+                    property: propertyName,
+                    value,
+                })}`,
+            });
+        }
+    }
+    return sidecars;
+}
+function circuitJsonConsumedPropertyKeys(component) {
+    const consumed = new Set();
+    const quantityKey = quantityKeyForComponent(component.kind);
+    if (quantityKey !== null) {
+        for (const name of VALUE_PROPERTY_NAMES[quantityKey]) {
+            consumed.add(name);
+        }
+    }
+    for (const name of MODEL_PROPERTY_NAMES) {
+        consumed.add(name);
+    }
+    consumed.add('ftype');
+    if (canCapGroupProperty(component) !== null) {
+        consumed.add('CanCapGroupId');
+        consumed.add('CanCapPackageName');
+        consumed.add('PackageName');
+    }
+    return consumed;
+}
+function quantityKeyForComponent(kind) {
+    switch (kind) {
+        case 'resistor':
+        case 'variable-resistor':
+        case 'potentiometer':
+            return 'resistance';
+        case 'capacitor':
+            return 'capacitance';
+        case 'inductor':
+            return 'inductance';
+        case 'voltage-source':
+        case 'battery':
+        case 'rail':
+            return 'voltage';
+        case 'current-source':
+            return 'current';
+        default:
+            return null;
+    }
+}
+function sourcePortElement(component, terminalName) {
     const voltage = component.kind === 'rail' ? quantity(component, 'voltage') : null;
     return {
         type: 'source_port',
@@ -671,15 +605,8 @@ function sourcePortElement(component: Component, terminalName: string): CircuitJ
         ...(voltage !== null ? { provides_voltage: voltage.value.value } : {}),
     };
 }
-
-function sourceTraceElements(
-    connectivity: Connectivity,
-    names: ReadonlyMap<NodeId, string>,
-    sourcePortIdsByNode: ReadonlyMap<NodeId, readonly string[]>,
-    warnings: string[],
-): readonly CircuitJsonSourceTrace[] {
-    const traces: CircuitJsonSourceTrace[] = [];
-
+function sourceTraceElements(connectivity, names, sourcePortIdsByNode, warnings) {
+    const traces = [];
     for (let nodeId = 0; nodeId < connectivity.nodeCount; nodeId += 1) {
         const sourcePortIds = sourcePortIdsByNode.get(nodeId) ?? [];
         if (sourcePortIds.length === 0) {
@@ -694,17 +621,11 @@ function sourceTraceElements(
             display_name: names.get(nodeId) ?? (connectivity.groundNodeId === nodeId ? 'GND' : `N${nodeId}`),
         });
     }
-
     return traces;
 }
-
-function schematicElements(
-    doc: CircuitDocument,
-    sourceTraces: readonly CircuitJsonSourceTrace[],
-): AnyCircuitElement[] {
-    const elements: AnyCircuitElement[] = [];
-    const schematicPortBySourcePortId = new Map<string, string>();
-
+function schematicElements(doc, sourceTraces) {
+    const elements = [];
+    const schematicPortBySourcePortId = new Map();
     for (const component of doc.components) {
         if (SOURCE_ONLY_NET_NAME_KINDS.has(component.kind)) {
             continue;
@@ -738,7 +659,6 @@ function schematicElements(
             });
         }
     }
-
     for (const trace of sourceTraces) {
         const sourcePortIds = trace.connected_source_port_ids;
         if (sourcePortIds.length < 2) {
@@ -762,7 +682,6 @@ function schematicElements(
             edges,
         });
     }
-
     for (const [index, directive] of doc.directives.entries()) {
         elements.push({
             type: 'schematic_text',
@@ -775,19 +694,16 @@ function schematicElements(
             anchor: 'left',
         });
     }
-
     return elements;
 }
-
-function normalizeCircuitJsonElements(elements: readonly unknown[]): CircuitJson {
+function normalizeCircuitJsonElements(elements) {
     const result = validateCircuitJsonDocument(elements);
     if (!result.valid) {
         throw new Error(`generated invalid Circuit JSON: ${result.errors.map((error) => `${error.path ?? '<root>'}: ${error.message}`).join('; ')}`);
     }
     return result.elements;
 }
-
-function schematicSymbolName(component: Component): string {
+function schematicSymbolName(component) {
     switch (component.kind) {
         case 'resistor':
         case 'variable-resistor':
@@ -843,8 +759,7 @@ function schematicSymbolName(component: Component): string {
             return 'testpoint_right';
     }
 }
-
-function schematicComponentSize(component: Component): { readonly width: number; readonly height: number } {
+function schematicComponentSize(component) {
     switch (component.kind) {
         case 'resistor':
         case 'variable-resistor':
@@ -872,13 +787,11 @@ function schematicComponentSize(component: Component): { readonly width: number;
             return DEFAULT_SCHEMATIC_COMPONENT_SIZE;
     }
 }
-
-function schematicDisplayValue(component: Component): string | undefined {
+function schematicDisplayValue(component) {
     const value = quantity(component, 'resistance') ?? quantity(component, 'capacitance') ?? quantity(component, 'inductance') ?? quantity(component, 'voltage') ?? quantity(component, 'current');
     return value?.value.raw;
 }
-
-function schematicPortFacingDirection(origin: Point, terminalPosition: Point): CircuitJsonSchematicPortDirection {
+function schematicPortFacingDirection(origin, terminalPosition) {
     const dx = terminalPosition.x - origin.x;
     const dy = terminalPosition.y - origin.y;
     if (Math.abs(dx) >= Math.abs(dy)) {
@@ -886,13 +799,11 @@ function schematicPortFacingDirection(origin: Point, terminalPosition: Point): C
     }
     return dy < 0 ? 'up' : 'down';
 }
-
-function isPolarizedCapacitor(component: Component): boolean {
+function isPolarizedCapacitor(component) {
     const text = searchablePropertyText(component);
     return text.includes('electrolytic') || text.includes('polar');
 }
-
-function diodeSymbolName(component: Component): string {
+function diodeSymbolName(component) {
     const text = searchablePropertyText(component);
     if (text.includes('zener')) {
         return 'zener_diode_horz';
@@ -902,8 +813,7 @@ function diodeSymbolName(component: Component): string {
     }
     return 'diode_right';
 }
-
-function mosfetSymbolName(component: Component): string {
+function mosfetSymbolName(component) {
     const channel = inferMosfetChannel(component);
     const mode = inferMosfetMode(component);
     if (channel === 'p') {
@@ -911,9 +821,8 @@ function mosfetSymbolName(component: Component): string {
     }
     return mode === 'depletion' ? 'n_channel_d_mosfet_transistor_horz' : 'n_channel_e_mosfet_transistor_horz';
 }
-
-function netNames(doc: CircuitDocument, connectivity: Connectivity): ReadonlyMap<NodeId, string> {
-    const names = new Map<NodeId, string>();
+function netNames(doc, connectivity) {
+    const names = new Map();
     for (const component of doc.components) {
         if (component.terminals.length === 0) {
             continue;
@@ -938,9 +847,8 @@ function netNames(doc: CircuitDocument, connectivity: Connectivity): ReadonlyMap
     }
     return names;
 }
-
-function railNodeIds(doc: CircuitDocument, connectivity: Connectivity): ReadonlySet<NodeId> {
-    const ids = new Set<NodeId>();
+function railNodeIds(doc, connectivity) {
+    const ids = new Set();
     for (const component of doc.components) {
         if (component.kind !== 'rail') {
             continue;
@@ -957,12 +865,8 @@ function railNodeIds(doc: CircuitDocument, connectivity: Connectivity): Readonly
     }
     return ids;
 }
-
-function sourceOnlyWarnings(
-    doc: CircuitDocument,
-    exportedComponentIds: ReadonlySet<string>,
-): readonly string[] {
-    const warnings: string[] = [];
+function sourceOnlyWarnings(doc, exportedComponentIds) {
+    const warnings = [];
     for (const component of doc.components) {
         if (exportedComponentIds.has(component.id)) {
             continue;
@@ -973,8 +877,7 @@ function sourceOnlyWarnings(
     }
     return warnings;
 }
-
-function appendSourcePort(map: Map<NodeId, string[]>, nodeId: NodeId, sourcePortIdValue: string): void {
+function appendSourcePort(map, nodeId, sourcePortIdValue) {
     const existing = map.get(nodeId);
     if (existing === undefined) {
         map.set(nodeId, [sourcePortIdValue]);
@@ -982,8 +885,7 @@ function appendSourcePort(map: Map<NodeId, string[]>, nodeId: NodeId, sourcePort
     }
     existing.push(sourcePortIdValue);
 }
-
-function quantity(component: Component, key: QuantityKey): QuantityLookup | null {
+function quantity(component, key) {
     const names = VALUE_PROPERTY_NAMES[key];
     for (const name of names) {
         const value = component.properties[name];
@@ -994,17 +896,10 @@ function quantity(component: Component, key: QuantityKey): QuantityLookup | null
     }
     return null;
 }
-
-function propertyQuantity(value: PropertyValue | undefined): ParsedQuantity | null {
+function propertyQuantity(value) {
     return propertyQuantityValue(value);
 }
-
-function missingQuantityComponent(
-    component: Component,
-    quantityName: string,
-    warnings: string[],
-    manufacturerPartNumber: string | null,
-): CircuitJsonSourceComponent {
+function missingQuantityComponent(component, quantityName, warnings, manufacturerPartNumber) {
     warnings.push(`${component.id} (${component.kind}): missing ${quantityName}; emitted opaque simple_chip source component metadata only`);
     return {
         ...sourceComponentBase(component),
@@ -1012,8 +907,7 @@ function missingQuantityComponent(
         ...(manufacturerPartNumber !== null ? { manufacturer_part_number: manufacturerPartNumber } : {}),
     };
 }
-
-function firstStringProperty(component: Component, names: readonly string[]): string | null {
+function firstStringProperty(component, names) {
     for (const name of names) {
         const value = component.properties[name];
         const text = propertyStringValue(value);
@@ -1023,29 +917,24 @@ function firstStringProperty(component: Component, names: readonly string[]): st
     }
     return null;
 }
-
-function inferTransistorType(component: Component): 'npn' | 'pnp' {
+function inferTransistorType(component) {
     const searchable = searchablePropertyText(component);
     return searchable.includes('pnp') ? 'pnp' : 'npn';
 }
-
-function inferMosfetChannel(component: Component): 'n' | 'p' {
+function inferMosfetChannel(component) {
     const searchable = searchablePropertyText(component);
     return searchable.includes('pmos') || searchable.includes('p-channel') || searchable.includes('p channel') ? 'p' : 'n';
 }
-
-function inferJfetChannel(component: Component): 'n' | 'p' {
+function inferJfetChannel(component) {
     const searchable = searchablePropertyText(component);
     return searchable.includes('pjf') || searchable.includes('p-channel') || searchable.includes('p channel') ? 'p' : 'n';
 }
-
-function inferMosfetMode(component: Component): 'enhancement' | 'depletion' {
+function inferMosfetMode(component) {
     const searchable = searchablePropertyText(component);
     return searchable.includes('depletion') ? 'depletion' : 'enhancement';
 }
-
-function searchablePropertyText(component: Component): string {
-    const values: string[] = [component.name, component.sourceTypeName ?? ''];
+function searchablePropertyText(component) {
+    const values = [component.name, component.sourceTypeName ?? ''];
     for (const value of Object.values(component.properties)) {
         const text = propertyStringValue(value);
         if (text !== null) {
@@ -1054,24 +943,19 @@ function searchablePropertyText(component: Component): string {
     }
     return values.join(' ').toLowerCase();
 }
-
-function sourceComponentId(componentId: string): string {
+function sourceComponentId(componentId) {
     return `source_component:${componentId}`;
 }
-
-function sourcePortId(componentId: string, terminalName: string): string {
+function sourcePortId(componentId, terminalName) {
     return `source_port:${componentId}:${terminalName}`;
 }
-
-function sourceNetId(nodeId: NodeId): string {
+function sourceNetId(nodeId) {
     return `source_net:${nodeId}`;
 }
-
-function sourceTraceId(nodeId: NodeId): string {
+function sourceTraceId(nodeId) {
     return `source_trace:${nodeId}`;
 }
-
-function sourcePortPosition(doc: CircuitDocument, sourcePortIdValue: string): Point {
+function sourcePortPosition(doc, sourcePortIdValue) {
     const parsed = parseSourcePortId(sourcePortIdValue);
     if (parsed === null) {
         return { x: 0, y: 0 };
@@ -1080,19 +964,16 @@ function sourcePortPosition(doc: CircuitDocument, sourcePortIdValue: string): Po
     const terminal = component?.terminals.find((candidate) => candidate.name === parsed.terminalName);
     return toTscircuitSchematicPoint(terminal?.position ?? component?.origin ?? { x: 0, y: 0 });
 }
-
-function toTscircuitSchematicPoint(point: Point): Point {
+function toTscircuitSchematicPoint(point) {
     return {
         x: roundTscircuitSchematicCoordinate(point.x * TSCIRCUIT_SCHEMATIC_COORD_SCALE),
         y: roundTscircuitSchematicCoordinate(point.y * TSCIRCUIT_SCHEMATIC_COORD_SCALE),
     };
 }
-
-function roundTscircuitSchematicCoordinate(value: number): number {
+function roundTscircuitSchematicCoordinate(value) {
     return Math.round(value * 1000) / 1000;
 }
-
-function parseSourcePortId(sourcePortIdValue: string): Readonly<{ componentId: string; terminalName: string }> | null {
+function parseSourcePortId(sourcePortIdValue) {
     const prefix = 'source_port:';
     if (!sourcePortIdValue.startsWith(prefix)) {
         return null;
@@ -1107,23 +988,16 @@ function parseSourcePortId(sourcePortIdValue: string): Readonly<{ componentId: s
         terminalName: rest.slice(separator + 1),
     };
 }
-
-function summarizeSchemaIssues(
-    issues: readonly {
-        readonly path: readonly (string | number)[];
-        readonly message: string;
-    }[],
-): string {
+function summarizeSchemaIssues(issues) {
     return issues
         .slice(0, 3)
         .map((issue) => {
-            const path = issue.path.length === 0 ? '<root>' : issue.path.join('.');
-            return `${path}: ${issue.message}`;
-        })
+        const path = issue.path.length === 0 ? '<root>' : issue.path.join('.');
+        return `${path}: ${issue.message}`;
+    })
         .join('; ');
 }
-
-function shallowSchemaIssue(value: unknown): string | null {
+function shallowSchemaIssue(value) {
     if (typeof value !== 'object' || value === null || Array.isArray(value)) {
         return 'Circuit JSON element must be an object';
     }
@@ -1134,33 +1008,61 @@ function shallowSchemaIssue(value: unknown): string | null {
     }
     return null;
 }
-
-function checkedRecord(value: unknown): JsonRecord {
+function checkedRecord(value) {
     if (typeof value !== 'object' || value === null || Array.isArray(value)) {
         throw new Error('expected Circuit JSON element object');
     }
     return Object.fromEntries(Object.entries(value));
 }
-
-function stringField(record: JsonRecord, key: string): string | null {
+function vesselDspPropertySidecar(record) {
+    const sourceComponentIdValue = stringField(record, 'source_component_id');
+    const propertyName = stringField(record, 'property_name');
+    const message = stringField(record, 'message');
+    if (sourceComponentIdValue === null || propertyName === null || message === null) {
+        return null;
+    }
+    if (!message.startsWith(VESSEL_DSP_PROPERTY_JSON_PREFIX)) {
+        return null;
+    }
+    const payload = parseJsonRecord(message.slice(VESSEL_DSP_PROPERTY_JSON_PREFIX.length));
+    if (payload === null || payload.property !== propertyName) {
+        return null;
+    }
+    const value = payload.value;
+    if (!isPropertyValue(value)) {
+        return null;
+    }
+    return {
+        sourceComponentId: sourceComponentIdValue,
+        propertyName,
+        value,
+    };
+}
+function parseJsonRecord(source) {
+    try {
+        const parsed = JSON.parse(source);
+        return isJsonRecord(parsed) ? parsed : null;
+    }
+    catch {
+        return null;
+    }
+}
+function stringField(record, key) {
     const value = record[key];
     return typeof value === 'string' ? value : null;
 }
-
-function requiredStringField(record: JsonRecord, key: string): string {
+function requiredStringField(record, key) {
     const value = stringField(record, key);
     if (value === null) {
         throw new Error(`Circuit JSON element is missing string field ${key}`);
     }
     return value;
 }
-
-function numericField(record: JsonRecord, key: string): number | null {
+function numericField(record, key) {
     const value = record[key];
     return typeof value === 'number' && Number.isFinite(value) ? value : null;
 }
-
-function pointField(record: JsonRecord, key: string): Point | null {
+function pointField(record, key) {
     const value = record[key];
     if (typeof value !== 'object' || value === null || Array.isArray(value)) {
         return null;
@@ -1170,30 +1072,57 @@ function pointField(record: JsonRecord, key: string): Point | null {
     const y = pointRecord.y;
     return typeof x === 'number' && typeof y === 'number' ? { x, y } : null;
 }
-
-function stringArrayField(record: JsonRecord, key: string): readonly string[] {
+function stringArrayField(record, key) {
     const value = record[key];
-    return Array.isArray(value) ? value.filter((entry): entry is string => typeof entry === 'string') : [];
+    return Array.isArray(value) ? value.filter((entry) => typeof entry === 'string') : [];
 }
-
-function stripKnownPrefix(value: string, prefix: string): string | null {
+function stripKnownPrefix(value, prefix) {
     return value.startsWith(prefix) ? value.slice(prefix.length) : null;
 }
-
-function sanitizeId(value: string): string {
+function sanitizeId(value) {
     const sanitized = value.replace(/\s+/g, '-').replace(/[^A-Za-z0-9_-]/g, '');
     return sanitized.length > 0 ? sanitized : 'component';
 }
-
-function terminalNameFromSourcePortId(sourcePortIdValue: string): string {
+function stableJsonStringify(value) {
+    return JSON.stringify(stableJsonValue(value)) ?? 'null';
+}
+function stableJsonValue(value) {
+    if (Array.isArray(value)) {
+        return value.map(stableJsonValue);
+    }
+    if (!isJsonRecord(value)) {
+        return value;
+    }
+    const out = {};
+    for (const key of Object.keys(value).sort()) {
+        out[key] = stableJsonValue(value[key]);
+    }
+    return out;
+}
+function isPropertyValue(value) {
+    if (value === null ||
+        typeof value === 'string' ||
+        typeof value === 'boolean' ||
+        (typeof value === 'number' && Number.isFinite(value))) {
+        return true;
+    }
+    if (Array.isArray(value)) {
+        return value.every(isPropertyValue);
+    }
+    if (!isJsonRecord(value)) {
+        return false;
+    }
+    return Object.values(value).every(isPropertyValue);
+}
+function isJsonRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function terminalNameFromSourcePortId(sourcePortIdValue) {
     const parsed = parseSourcePortId(sourcePortIdValue);
     return parsed?.terminalName ?? sanitizeId(sourcePortIdValue);
 }
-
-function groupPortsByComponent(
-    sourcePorts: ReadonlyMap<string, SourcePortRecord>,
-): ReadonlyMap<string, readonly SourcePortRecord[]> {
-    const map = new Map<string, SourcePortRecord[]>();
+function groupPortsByComponent(sourcePorts) {
+    const map = new Map();
     for (const port of sourcePorts.values()) {
         const existing = map.get(port.componentSourceId);
         if (existing === undefined) {
@@ -1204,20 +1133,15 @@ function groupPortsByComponent(
     }
     return map;
 }
-
-function buildComponentFromCircuitJson(
-    sourceComponent: SourceComponentRecord,
-    ports: readonly SourcePortRecord[],
-    schematicComponents: ReadonlyMap<string, SchematicComponentRecord>,
-    schematicPorts: ReadonlyMap<string, SchematicPortRecord>,
-    index: number,
-): MutableComponentBuild & { readonly component: Component } {
+function buildComponentFromCircuitJson(sourceComponent, ports, schematicComponents, schematicPorts, sourceGroups, sidecars, index) {
     const origin = schematicComponents.get(sourceComponent.sourceComponentId)?.center ?? synthesizedOrigin(index);
     const terminals = ports.map((port, portIndex) => ({
         name: port.terminalName,
         position: schematicPorts.get(port.sourcePortId)?.center ?? synthesizedTerminalPosition(origin, ports.length, portIndex),
     }));
-    const component: Component = {
+    const sidecarProperties = propertiesFromSidecars(sidecars);
+    const groupedProperties = canCapPropertiesFromSourceGroup(sourceComponent, sourceGroups, sidecarProperties);
+    const component = {
         id: sourceComponent.componentId,
         kind: kindFromCircuitJsonFtype(sourceComponent.ftype),
         name: sourceComponent.name,
@@ -1225,19 +1149,49 @@ function buildComponentFromCircuitJson(
         rotation: 0,
         flipped: false,
         terminals,
-        properties: propertiesFromCircuitJsonComponent(sourceComponent.record),
+        properties: {
+            ...propertiesFromCircuitJsonComponent(sourceComponent.record),
+            ...sidecarProperties,
+            ...groupedProperties,
+        },
         sourceTypeName: sourceComponent.ftype === null ? 'circuit-json:source_component' : `circuit-json:${sourceComponent.ftype}`,
     };
     return { sourceComponent, ports, origin, terminals, component };
 }
-
-function synthesizedOrigin(index: number): Point {
+function propertiesFromSidecars(sidecars) {
+    const properties = {};
+    for (const sidecar of sidecars) {
+        properties[sidecar.propertyName] = sidecar.value;
+    }
+    return properties;
+}
+function canCapPropertiesFromSourceGroup(sourceComponent, sourceGroups, sidecarProperties) {
+    const sourceGroupId = sourceComponent.sourceGroupId;
+    if (sourceGroupId === null) {
+        return {};
+    }
+    if (kindFromCircuitJsonFtype(sourceComponent.ftype) !== 'capacitor') {
+        return {};
+    }
+    const discriminatorGroupId = canCapGroupIdFromSourceGroupId(sourceGroupId);
+    const hasCanCapSection = sidecarProperties.CanCapSection !== undefined;
+    if (discriminatorGroupId === null && !hasCanCapSection) {
+        return {};
+    }
+    const group = sourceGroups.get(sourceGroupId);
+    const fallbackGroupId = stripKnownPrefix(sourceGroupId, 'source_group:') ?? sourceGroupId;
+    const canCapGroupId = discriminatorGroupId ?? fallbackGroupId;
+    return {
+        CanCapGroupId: canCapGroupId,
+        ...(group?.name === null || group?.name === undefined ? {} : { CanCapPackageName: group.name }),
+    };
+}
+function synthesizedOrigin(index) {
     const column = index % 4;
     const row = Math.floor(index / 4);
     return { x: column * 80, y: row * 60 };
 }
-
-function synthesizedTerminalPosition(origin: Point, terminalCount: number, index: number): Point {
+function synthesizedTerminalPosition(origin, terminalCount, index) {
     if (terminalCount <= 1) {
         return origin;
     }
@@ -1249,8 +1203,7 @@ function synthesizedTerminalPosition(origin: Point, terminalCount: number, index
     const step = terminalCount === 1 ? 0 : 40 / (terminalCount - 1);
     return { x: origin.x - 20, y: origin.y - 20 + step * index };
 }
-
-function kindFromCircuitJsonFtype(ftype: string | null): ComponentKind {
+function kindFromCircuitJsonFtype(ftype) {
     switch (ftype) {
         case 'simple_resistor':
             return 'resistor';
@@ -1293,9 +1246,8 @@ function kindFromCircuitJsonFtype(ftype: string | null): ComponentKind {
             return 'unsupported';
     }
 }
-
-function propertiesFromCircuitJsonComponent(record: JsonRecord): Readonly<Record<string, PropertyValue>> {
-    const properties: Record<string, PropertyValue> = {};
+function propertiesFromCircuitJsonComponent(record) {
+    const properties = {};
     const ftype = stringField(record, 'ftype');
     const displayValue = stringField(record, 'display_value');
     if (displayValue !== null) {
@@ -1316,14 +1268,7 @@ function propertiesFromCircuitJsonComponent(record: JsonRecord): Readonly<Record
     }
     return properties;
 }
-
-function addQuantityProperty(
-    properties: Record<string, PropertyValue>,
-    propertyName: string,
-    record: JsonRecord,
-    displayKey: string | null,
-    numericKey: string,
-): void {
+function addQuantityProperty(properties, propertyName, record, displayKey, numericKey) {
     const display = displayKey === null ? null : stringField(record, displayKey);
     if (display !== null) {
         properties[propertyName] = parseQuantity(display) ?? display;
@@ -1334,11 +1279,8 @@ function addQuantityProperty(
         properties[propertyName] = numeric;
     }
 }
-
-function terminalPositionMap(
-    builds: readonly (MutableComponentBuild & { readonly component: Component })[],
-): ReadonlyMap<string, Point> {
-    const map = new Map<string, Point>();
+function terminalPositionMap(builds) {
+    const map = new Map();
     for (const build of builds) {
         for (const port of build.ports) {
             const terminal = build.component.terminals.find((candidate) => candidate.name === port.terminalName);
@@ -1349,12 +1291,8 @@ function terminalPositionMap(
     }
     return map;
 }
-
-function wireElementsFromSourceTraces(
-    sourceTraces: readonly JsonRecord[],
-    terminalPositions: ReadonlyMap<string, Point>,
-): readonly Wire[] {
-    const wires: Wire[] = [];
+function wireElementsFromSourceTraces(sourceTraces, terminalPositions) {
+    const wires = [];
     for (const trace of sourceTraces) {
         const ports = stringArrayField(trace, 'connected_source_port_ids');
         if (ports.length < 2) {
@@ -1378,18 +1316,14 @@ function wireElementsFromSourceTraces(
     }
     return wires;
 }
-
-function warningsForUnconnectedNets(
-    sourceNets: ReadonlyMap<string, JsonRecord>,
-    sourceTraces: readonly JsonRecord[],
-): readonly Warning[] {
-    const referencedNetIds = new Set<string>();
+function warningsForUnconnectedNets(sourceNets, sourceTraces) {
+    const referencedNetIds = new Set();
     for (const trace of sourceTraces) {
         for (const netId of stringArrayField(trace, 'connected_source_net_ids')) {
             referencedNetIds.add(netId);
         }
     }
-    const warnings: Warning[] = [];
+    const warnings = [];
     for (const [netId, net] of sourceNets) {
         if (!referencedNetIds.has(netId)) {
             warnings.push({
@@ -1400,11 +1334,11 @@ function warningsForUnconnectedNets(
     }
     return warnings;
 }
-
-function filenameWithoutCircuitJsonExtension(filename: string): string {
+function filenameWithoutCircuitJsonExtension(filename) {
     return filename
         .replace(/\.circuit\.json$/i, '')
         .replace(/\.json$/i, '')
         .replace(/[-_]+/g, ' ')
         .trim();
 }
+//# sourceMappingURL=serializer.js.map