smithkit 0.1.1 → 0.2.0

package/dist/lib/SmithFormatter.js

@@ -0,0 +1,19 @@
+import { format } from 'd3';
+export class SmithFormatter {
+    constructor() { }
+    /** Format with three significant digits and an SI prefix; includes spacing before the unit. */
+    static number(value) {
+        const formatted = format('.3~s')(value);
+        return Number.isFinite(value) && /[a-zA-Zµ]$/.test(formatted)
+            ? formatted.replace(/([a-zA-Zµ])$/, ' $1')
+            : formatted + ' ';
+    }
+    /** Format Cartesian components to decimalPlaces fractional digits. */
+    static complex(value, unit = '', decimalPlaces = 3) {
+        return `${value.toString(decimalPlaces)} ${unit === '' ? '' : `[${unit}]`}`;
+    }
+    /** Format magnitude and phase in degrees to decimalPlaces fractional digits. */
+    static polar(value, unit = '', decimalPlaces = 3) {
+        return `${value.abs().toFixed(decimalPlaces)} ${unit} ∠${((value.arg() * 180) / Math.PI).toFixed(decimalPlaces)}°`;
+    }
+}

package/dist/lib/grid/CircleLayerControl.d.ts

@@ -0,0 +1,15 @@
+import type { ConstQCircles } from './ConstQCircles.js';
+import type { ConstSwrCircles } from './ConstSwrCircles.js';
+import type { CircleLayer, CircleStyle } from '../layers.js';
+import { LayerControl } from './LayerControl.js';
+/** Exposes Q/VSWR circle controls without exposing the SVG renderer. */
+export declare class CircleLayerControl extends LayerControl implements CircleLayer {
+    private readonly layer;
+    private readonly minimum;
+    constructor(layer: ConstQCircles | ConstSwrCircles, minimum: number, assertAlive: () => void);
+    setVisible(visible: boolean): void;
+    setStyle(style: Partial<CircleStyle>): void;
+    addValue(value: number): void;
+    removeValue(value: number): void;
+    private validateValue;
+}

package/dist/lib/grid/CircleLayerControl.js

@@ -0,0 +1,40 @@
+import { LayerControl } from './LayerControl.js';
+/** Exposes Q/VSWR circle controls without exposing the SVG renderer. */
+export class CircleLayerControl extends LayerControl {
+    layer;
+    minimum;
+    constructor(layer, minimum, assertAlive) {
+        super(assertAlive);
+        this.layer = layer;
+        this.minimum = minimum;
+    }
+    setVisible(visible) {
+        this.assertAlive();
+        this.layer.visibility(visible);
+    }
+    setStyle(style) {
+        this.assertAlive();
+        this.validateLengths(style, ['strokeWidth']);
+        if (style.stroke !== undefined) {
+            this.layer.Stroke = style.stroke;
+        }
+        if (style.strokeWidth !== undefined) {
+            this.layer.StrokeWidth = String(style.strokeWidth);
+        }
+    }
+    addValue(value) {
+        this.assertAlive();
+        this.validateValue(value);
+        this.layer.append(value);
+    }
+    removeValue(value) {
+        this.assertAlive();
+        this.validateValue(value);
+        this.layer.remove(value);
+    }
+    validateValue(value) {
+        if (!Number.isFinite(value) || value < this.minimum || value <= 0) {
+            throw new RangeError(`Circle value must be finite, positive, and at least ${this.minimum}.`);
+        }
+    }
+}

package/dist/lib/{draw → grid}/ConstCircles.d.ts

@@ -1,10 +1,8 @@
 import type * as d3 from 'd3';
-import { SmithGroup } from './SmithGroup.js';
-import { SmithScaler } from './SmithScaler.js';
-import { Line } from '../shapes/Line.js';
-import { Circle } from '../shapes/Circle.js';
-import { Point } from '../shapes/Point.js';
-import { SmithConstantCircle } from '../SmithConstantCircle.js';
+import { SmithGroup } from '../svg/SmithGroup.js';
+import { SmithScaler } from '../svg/SmithScaler.js';
+import type { Line, Circle, Point } from '../math/geometry.js';
+import { SmithConstantCircle } from '../rf/SmithConstantCircle.js';
 export interface ArcData {
     p1: Point;
     p2: Point;

package/dist/lib/{draw → grid}/ConstCircles.js

@@ -1,5 +1,5 @@
-import { SmithGroup } from './SmithGroup.js';
-import { SmithConstantCircle } from '../SmithConstantCircle.js';
+import { SmithGroup } from '../svg/SmithGroup.js';
+import { SmithConstantCircle } from '../rf/SmithConstantCircle.js';
 export class ConstCircles {
     scaler;
     calcs = new SmithConstantCircle();

package/dist/lib/{draw → grid}/ConstQCircles.d.ts

@@ -1,5 +1,5 @@
-import { SmithGroup } from './SmithGroup.js';
-import { SmithScaler } from './SmithScaler.js';
+import { SmithGroup } from '../svg/SmithGroup.js';
+import { SmithScaler } from '../svg/SmithScaler.js';
 interface ConstQDrawOptions {
     stroke: string;
     strokeWidth: string;

package/dist/lib/{draw → grid}/ConstQCircles.js

@@ -1,6 +1,6 @@
-import { SmithGroup } from './SmithGroup.js';
-import { SmithArc } from './SmithArc.js';
-import { SmithConstantCircle } from '../SmithConstantCircle.js';
+import { SmithGroup } from '../svg/SmithGroup.js';
+import { SmithArc } from '../svg/SmithArc.js';
+import { SmithConstantCircle } from '../rf/SmithConstantCircle.js';
 export class ConstQCircles {
     scaler;
     calcs = new SmithConstantCircle();

package/dist/lib/{draw → grid}/ConstSwrCircles.d.ts

@@ -1,5 +1,5 @@
-import { SmithGroup } from './SmithGroup.js';
-import { SmithScaler } from './SmithScaler.js';
+import { SmithGroup } from '../svg/SmithGroup.js';
+import { SmithScaler } from '../svg/SmithScaler.js';
 interface ConstSwrDrawOptions {
     stroke: string;
     strokeWidth: string;

package/dist/lib/{draw → grid}/ConstSwrCircles.js

@@ -1,6 +1,6 @@
-import { SmithGroup } from './SmithGroup.js';
-import { SmithCircle } from './SmithCircle.js';
-import { SmithConstantCircle } from '../SmithConstantCircle.js';
+import { SmithGroup } from '../svg/SmithGroup.js';
+import { SmithCircle } from '../svg/SmithCircle.js';
+import { SmithConstantCircle } from '../rf/SmithConstantCircle.js';
 export class ConstSwrCircles {
     scaler;
     calcs = new SmithConstantCircle();

package/dist/lib/grid/GridDefinitions.d.ts

@@ -0,0 +1,12 @@
+import type { SmithTicksData } from './types.js';
+export declare class GridDefinitions {
+    private constructor();
+    private static readonly resistanceMajor;
+    private static readonly resistanceMinor;
+    private static readonly reactanceMajor;
+    private static readonly reactanceMinor;
+    private static resistanceArcs;
+    private static reactanceArcs;
+    /** Build fresh definitions so callers cannot mutate another chart's grid. */
+    static create(): SmithTicksData;
+}

package/dist/lib/grid/GridDefinitions.js

@@ -0,0 +1,138 @@
+export class GridDefinitions {
+    constructor() { }
+    static resistanceMajor = [
+        [[0.05, 0.15], 0.2, -0.2, false],
+        [[0.1, 0.3, 0.5, 0.7, 0.9], 2, -2, true],
+        [[0.2, 0.4, 0.6, 0.8, 1.2, 1.4, 1.6, 1.8], 5, -5, true],
+        [[1, 3, 5], 10, -10, true],
+        [[2, 4], 20, -20, true],
+        [[20], 50, -50, true],
+    ];
+    static resistanceMinor = [
+        [[0.02, 0.04, 0.06, 0.08, 0.12, 0.14, 0.16, 0.18], 0.2, 0.5, false],
+        [[0.02, 0.04, 0.06, 0.08, 0.12, 0.14, 0.16, 0.18], -0.2, -0.5, false],
+        [[0.05, 0.15, 0.25, 0.35, 0.45], 0.5, 1, false],
+        [[0.05, 0.15, 0.25, 0.35, 0.45], -0.5, -1, false],
+        [
+            [
+                0.01, 0.02, 0.03, 0.04, 0.06, 0.07, 0.08, 0.09, 0.11, 0.12, 0.13, 0.14, 0.16, 0.17, 0.18,
+                0.19,
+            ],
+            0.2,
+            -0.2,
+            false,
+        ],
+        [[0.22, 0.24, 0.26, 0.28, 0.32, 0.34, 0.36, 0.38, 0.42, 0.44, 0.46, 0.48], 0.5, -0.5, false],
+        [[0.55, 0.65, 0.75, 0.85, 0.95], 2, -2, true],
+        [[1.1, 1.3, 1.5, 1.7, 1.9], 2, -2, false],
+        [[2.2, 2.4, 2.6, 2.8, 3.2, 3.4, 3.6, 3.8], 5, -5, true],
+        [[4.2, 4.4, 4.6, 4.8], 5, -5, false],
+        [[6, 8, 12, 14, 16, 18], 20, -20, true],
+        [[7, 9], 10, -10, true],
+        [[30, 40], 50, -50, true],
+    ];
+    static reactanceMajor = [
+        [[0.05, 0.15], 0.2, 0],
+        [[0.1, 0.3, 0.5, 0.7, 0.9], 2, 0],
+        [[0.2, 0.4, 0.6, 0.8, 1.2, 1.4, 1.6, 1.8], 5, 0],
+        [[1, 3, 5], 10, 0],
+        [[2, 4, 10], 20, 0],
+        [[20], 50, 0],
+    ];
+    static reactanceMinor = [
+        [
+            [
+                0.01, 0.02, 0.03, 0.04, 0.06, 0.07, 0.08, 0.09, 0.11, 0.12, 0.13, 0.14, 0.16, 0.17, 0.18,
+                0.19,
+            ],
+            0.2,
+            0,
+        ],
+        [[0.02, 0.04, 0.06, 0.08, 0.12, 0.14, 0.16, 0.18], 0.5, 0.2],
+        [[0.22, 0.24, 0.26, 0.28, 0.32, 0.34, 0.36, 0.38, 0.42, 0.44, 0.46, 0.48], 0.5, 0],
+        [[0.05, 0.15, 0.25, 0.35, 0.45], 1, 0.5],
+        [[0.55, 0.65, 0.75, 0.85, 0.95], 1, 0],
+        [[1.1, 1.3, 1.5, 1.7, 1.9], 2, 0],
+        [[2.2, 2.4, 2.6, 2.8, 3.2, 3.4, 3.6, 3.8, 4.2, 4.4, 4.6, 4.8], 5, 0],
+        [[6, 8, 14, 16, 18], 20, 0],
+        [[7, 9], 10, 0],
+        [[12, 30, 40], 50, 0],
+    ];
+    static resistanceArcs(bands) {
+        return bands.flatMap(([values, from, to, largeArc]) => values.map((value) => [
+            value,
+            [
+                [from, from < 0 ? 1 : 0],
+                [to, to < 0 ? 1 : 0],
+            ],
+            [largeArc, from > to],
+        ]));
+    }
+    static reactanceArcs(bands) {
+        return bands.flatMap(([values, outer, inner]) => values.flatMap((value) => [
+            [
+                value,
+                [
+                    [outer, 1],
+                    [inner, 1],
+                ],
+                [false, false],
+            ],
+            [
+                -value,
+                [
+                    [outer, 0],
+                    [inner, 0],
+                ],
+                [false, true],
+            ],
+        ]));
+    }
+    /** Build fresh definitions so callers cannot mutate another chart's grid. */
+    static create() {
+        return {
+            resistance: {
+                major: {
+                    lines: [],
+                    circles: [10, 50],
+                    arcs: GridDefinitions.resistanceArcs(GridDefinitions.resistanceMajor),
+                },
+                minor: {
+                    lines: [],
+                    circles: [],
+                    arcs: GridDefinitions.resistanceArcs(GridDefinitions.resistanceMinor),
+                },
+            },
+            reactance: {
+                major: {
+                    lines: [{ p1: [-1, 0], p2: [1, 0] }],
+                    circles: [],
+                    arcs: [
+                        ...GridDefinitions.reactanceArcs(GridDefinitions.reactanceMajor),
+                        [
+                            50,
+                            [
+                                [0, 0],
+                                [0, 1],
+                            ],
+                            [false, false],
+                        ],
+                        [
+                            -50,
+                            [
+                                [0, 1],
+                                [0, 0],
+                            ],
+                            [false, true],
+                        ],
+                    ],
+                },
+                minor: {
+                    lines: [],
+                    circles: [],
+                    arcs: GridDefinitions.reactanceArcs(GridDefinitions.reactanceMinor),
+                },
+            },
+        };
+    }
+}

package/dist/lib/grid/GridGeometry.d.ts

@@ -0,0 +1,26 @@
+import type { TickDefRequired } from './Tick.js';
+import type { SmithTicksShapes } from './types.js';
+import type { Point } from '../math/geometry.js';
+export type GridKind = 'resistance' | 'reactance' | 'conductance' | 'susceptance';
+export type GridArc = [Point, Point, number, boolean, boolean];
+export declare class GridGeometry {
+    private constructor();
+    private static readonly calcs;
+    private static readonly circles;
+    private static readonly clipping;
+    /** Normalized geometry only: no DOM, D3, or pixel coordinates. */
+    static shapes(kind: GridKind, data: SmithTicksShapes): {
+        lines: import("../math/geometry.js").Line[];
+        circles: import("../math/geometry.js").Circle[];
+        arcs: GridArc[];
+    };
+    static label(kind: GridKind, definition: TickDefRequired): {
+        point: [number, number];
+        text: string;
+        rotate: number;
+        dx: number;
+        dy: number;
+        textAnchor: string;
+        dominantBaseline: string;
+    };
+}

package/dist/lib/grid/GridGeometry.js

@@ -0,0 +1,58 @@
+import { SmithConstantCircle } from '../rf/SmithConstantCircle.js';
+import { Complex } from '../math/Complex.js';
+export class GridGeometry {
+    constructor() { }
+    static calcs = new SmithConstantCircle();
+    static circles = {
+        resistance: (value) => GridGeometry.calcs.resistanceCircle(value),
+        reactance: (value) => GridGeometry.calcs.reactanceCircle(value),
+        conductance: (value) => GridGeometry.calcs.conductanceCircle(value),
+        susceptance: (value) => GridGeometry.calcs.susceptanceCircle(value),
+    };
+    static clipping = {
+        resistance: 'reactance',
+        reactance: 'resistance',
+        conductance: 'susceptance',
+        susceptance: 'conductance',
+    };
+    /** Normalized geometry only: no DOM, D3, or pixel coordinates. */
+    static shapes(kind, data) {
+        const circle = GridGeometry.circles[kind];
+        const clip = GridGeometry.circles[GridGeometry.clipping[kind]];
+        return {
+            lines: data.lines,
+            circles: data.circles.map(circle),
+            arcs: data.arcs.map(([value, limits, options]) => {
+                const c = circle(value);
+                const [a, b] = limits.map(([limit, index]) => GridGeometry.calcs.circleCircleIntersection(c, clip(limit))[index]);
+                return [a, b, c.r, options[0], options[1]];
+            }),
+        };
+    }
+    static label(kind, definition) {
+        const { point, transform, dp, textAnchor, dominantBaseline } = definition;
+        const admittance = kind === 'conductance' || kind === 'susceptance';
+        const real = kind === 'resistance' || kind === 'conductance';
+        const rc = admittance
+            ? GridGeometry.calcs.admittanceToRflCoeff(Complex.from(point.r, point.i))
+            : GridGeometry.calcs.impedanceToRflCoeff(Complex.from(point.r, point.i));
+        if (!rc) {
+            throw new Error('Invalid grid label coordinates.');
+        }
+        const value = real ? point.r : point.i;
+        const circle = GridGeometry.circles[kind](value);
+        let rotate = -GridGeometry.calcs.tangentToCircleAngle(circle, rc.toVector()) + transform.rotate;
+        if (admittance && rotate !== 90) {
+            rotate += 180;
+        }
+        return {
+            point: rc.toVector(),
+            text: value.toFixed(dp),
+            rotate,
+            dx: transform.dx,
+            dy: transform.dy,
+            textAnchor,
+            dominantBaseline,
+        };
+    }
+}

package/dist/lib/grid/GridLabels.d.ts

@@ -0,0 +1,8 @@
+import { Tick } from './Tick.js';
+export declare class GridLabels {
+    private constructor();
+    private static readonly values;
+    private static readonly interiorValues;
+    static resistance(): Tick[];
+    static reactance(): Tick[];
+}

package/dist/lib/grid/GridLabels.js

@@ -0,0 +1,45 @@
+import { Tick } from './Tick.js';
+export class GridLabels {
+    constructor() { }
+    static values = [
+        0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 1.2, 1.4, 1.6, 1.8, 2, 3, 4, 5, 10, 20, 50,
+    ];
+    static interiorValues = [0.2, 0.4, 0.6, 0.8, 1];
+    static resistance() {
+        const axis = [0, ...GridLabels.values].map((r) => new Tick({
+            point: { r, i: 0 },
+            dp: r === 0 || r >= 10 ? 0 : 1,
+            // Keep the zero inside the rim and clear of the opposite grid's high-value labels.
+            transform: { dx: r === 0 ? 0.02 : 0.005, dy: r === 0 ? 0.02 : -0.005 },
+            dominantBaseline: r === 0 ? 'hanging' : 'baseline',
+        }));
+        const interior = [1, -1].flatMap((i) => [...GridLabels.interiorValues].reverse().map((r) => new Tick({
+            point: { r, i },
+            dp: 1,
+            transform: { dx: i * 0.005, dy: -0.005, rotate: i < 0 ? 180 : 0 },
+            textAnchor: i < 0 ? 'end' : 'start',
+        })));
+        return [...axis, ...interior];
+    }
+    static reactance() {
+        return [1, -1].flatMap((sign) => [
+            ...GridLabels.interiorValues.map((i) => ({ r: 1, i: sign * i })),
+            ...GridLabels.values.map((i) => ({ r: 0, i: sign * i })),
+        ].map((point) => new Tick({
+            point,
+            dp: Math.abs(point.i) >= 10 ? 0 : 1,
+            transform: {
+                dx: -sign * 0.005,
+                dy: -0.005,
+                rotate: sign > 0
+                    ? point.r === 1 || point.i < 1
+                        ? 180
+                        : 0
+                    : point.r === 0 && point.i < -1
+                        ? 180
+                        : 0,
+            },
+            textAnchor: sign > 0 ? 'end' : 'start',
+        })));
+    }
+}

package/dist/lib/grid/GridLayerControl.d.ts

@@ -0,0 +1,12 @@
+import type { ConstCircles } from './ConstCircles.js';
+import type { GridLayer, GridStyle } from '../layers.js';
+import { LayerControl } from './LayerControl.js';
+/** Exposes grid controls without exposing the SVG renderer. */
+export declare class GridLayerControl extends LayerControl implements GridLayer {
+    private readonly layer;
+    private readonly changed;
+    constructor(layer: ConstCircles, assertAlive: () => void, changed: () => void);
+    setVisible(visible: boolean): void;
+    setMinorVisible(visible: boolean): void;
+    setStyle(style: Partial<GridStyle>): void;
+}

package/dist/lib/grid/GridLayerControl.js

@@ -0,0 +1,39 @@
+import { LayerControl } from './LayerControl.js';
+/** Exposes grid controls without exposing the SVG renderer. */
+export class GridLayerControl extends LayerControl {
+    layer;
+    changed;
+    constructor(layer, assertAlive, changed) {
+        super(assertAlive);
+        this.layer = layer;
+        this.changed = changed;
+    }
+    setVisible(visible) {
+        this.assertAlive();
+        this.layer.visibility(visible);
+        this.changed();
+    }
+    setMinorVisible(visible) {
+        this.assertAlive();
+        this.layer.displayMinor(visible);
+    }
+    setStyle(style) {
+        this.assertAlive();
+        this.validateLengths(style, ['majorWidth', 'minorWidth', 'textFontSize']);
+        const properties = {
+            stroke: 'Stroke',
+            majorWidth: 'MajorWidth',
+            minorWidth: 'MinorWidth',
+            textColor: 'TextColor',
+            textFontFamily: 'TextFontFamily',
+            textFontSize: 'TextFontSize',
+        };
+        for (const key of Object.keys(properties)) {
+            const value = style[key];
+            if (value !== undefined) {
+                this.layer[properties[key]] = String(value);
+            }
+        }
+        this.changed();
+    }
+}

package/dist/lib/grid/LayerControl.d.ts

@@ -0,0 +1,6 @@
+/** Shared lifecycle and style validation for chart layer adapters. */
+export declare abstract class LayerControl {
+    protected readonly assertAlive: () => void;
+    protected constructor(assertAlive: () => void);
+    protected validateLengths<T>(style: T, keys: readonly (keyof T)[]): void;
+}

package/dist/lib/grid/LayerControl.js

@@ -0,0 +1,16 @@
+/** Shared lifecycle and style validation for chart layer adapters. */
+export class LayerControl {
+    assertAlive;
+    constructor(assertAlive) {
+        this.assertAlive = assertAlive;
+    }
+    validateLengths(style, keys) {
+        for (const key of keys) {
+            const value = style[key];
+            if (value !== undefined &&
+                (typeof value !== 'number' || !Number.isFinite(value) || value <= 0)) {
+                throw new RangeError(`${String(key)} must be a positive finite number.`);
+            }
+        }
+    }
+}

package/dist/lib/{draw → grid}/SmithGridLayer.d.ts

@@ -1,8 +1,8 @@
 import { ConstCircles } from './ConstCircles.js';
-import { SmithGroup } from './SmithGroup.js';
-import type { SmithScaler } from './SmithScaler.js';
-import type { SmithTicksData } from '../grid/types.js';
-import { type GridKind } from '../grid/geometry.js';
+import { SmithGroup } from '../svg/SmithGroup.js';
+import type { SmithScaler } from '../svg/SmithScaler.js';
+import type { SmithTicksData } from './types.js';
+import { type GridKind } from './GridGeometry.js';
 export interface GridLayerParams {
     scaler: SmithScaler;
     showMinor: boolean;
@@ -15,5 +15,6 @@ export declare class SmithGridLayer extends ConstCircles {
     protected minor: SmithGroup;
     protected texts: SmithGroup;
     constructor(params: GridLayerParams, kind: GridKind);
+    private static labelPriority;
     private drawGrid;
 }

package/dist/lib/{draw → grid}/SmithGridLayer.js

@@ -1,8 +1,8 @@
 import { ConstCircles } from './ConstCircles.js';
-import { SmithGroup } from './SmithGroup.js';
-import { SmithText } from './SmithText.js';
-import { gridGeometry, gridLabel } from '../grid/geometry.js';
-import { resistanceLabels, reactanceLabels } from '../grid/labels.js';
+import { SmithGroup } from '../svg/SmithGroup.js';
+import { SmithText } from '../svg/SmithText.js';
+import { GridGeometry } from './GridGeometry.js';
+import { GridLabels } from './GridLabels.js';
 /** SVG adapter shared by the four constant impedance/admittance layers. */
 export class SmithGridLayer extends ConstCircles {
     kind;
@@ -20,23 +20,40 @@ export class SmithGridLayer extends ConstCircles {
             .attr('stroke', 'none')
             .attr('font-size', '7')
             .attr('font-family', 'Verdana');
-        for (const tick of real ? resistanceLabels() : reactanceLabels()) {
-            const label = gridLabel(kind, tick.definition);
-            this.texts.append(new SmithText(this.scaler.point(label.point), label.text, {
+        for (const tick of real ? GridLabels.resistance() : GridLabels.reactance()) {
+            const label = GridGeometry.label(kind, tick.definition);
+            const text = new SmithText(this.scaler.point(label.point), label.text, {
                 rotate: label.rotate,
                 dx: this.scaler.r(label.dx).toString(),
                 dy: this.scaler.r(label.dy).toString(),
                 textAnchor: label.textAnchor,
                 dominantBaseline: label.dominantBaseline,
-            }));
+            });
+            text.Element.attr('data-label-priority', SmithGridLayer.labelPriority(tick.definition.point.r, tick.definition.point.i));
+            this.texts.append(text);
         }
         this.build();
         if (!params.showMinor) {
             this.minor.hide();
         }
     }
+    static labelPriority(real, imaginary) {
+        const value = Math.abs(imaginary === 0 ? real : imaginary);
+        const importance = value === 0
+            ? 300
+            : value === 1
+                ? 100
+                : value === 50
+                    ? 90
+                    : [0.5, 2].includes(value)
+                        ? 80
+                        : [0.2, 5, 10].includes(value)
+                            ? 70
+                            : 40;
+        return importance + (imaginary === 0 ? 20 : real === 0 ? 10 : 0);
+    }
     drawGrid(definitions, width) {
-        const geometry = gridGeometry(this.kind, definitions);
+        const geometry = GridGeometry.shapes(this.kind, definitions);
         const group = new SmithGroup();
         this.drawShapes(group.Element, this.opts.stroke, width, {
             lines: geometry.lines.map((line) => this.scaler.line(line)),

package/dist/lib/grid/types.d.ts

@@ -1,4 +1,4 @@
-import type { Line } from '../shapes/Line.js';
+import type { Line } from '../math/geometry.js';
 export declare enum SmithArcEntry {
     circle = 0,
     clipCircles = 1,

package/dist/lib/index.d.ts

@@ -1,16 +1,14 @@
 export { Smith, SmithEventType } from './Smith.js';
 export type { SmithEvent } from './Smith.js';
-export { Complex } from './complex/Complex.js';
+export { Complex } from './math/Complex.js';
 export type { TraceSamples, TraceSample } from './samples.js';
-export { parseTouchstone } from './io/touchstone.js';
-export type { TouchstoneData } from './io/touchstone.js';
+export { Touchstone } from './io/Touchstone.js';
+export type { TouchstoneData } from './io/Touchstone.js';
 export { SmithScales } from './scales/SmithScales.js';
-export { compareMarkerReadings } from './measurements.js';
+export { MarkerMeasurements } from './MarkerMeasurements.js';
 export type { TraceOptions, TraceUpdateOptions, MarkerSelectionStrategy, TraceStyle, TraceRenderMode, TraceInfo, MarkerInfo, MarkerSnapshot, MarkerComparison, } from './measurements.js';
-export { readReflection, reflectionToImpedance, impedanceToReflection, reflectionToAdmittance, admittanceToReflection, } from './rf.js';
-export type { SmithReading } from './rf.js';
+export { RfCalculations } from './rf/RfCalculations.js';
+export type { SmithReading } from './rf/RfCalculations.js';
 export type { GridStyle, CircleStyle, GridLayer, CircleLayer, ChartLayers, PeripheralScales, } from './layers.js';
-export { renormalizeReflection, renormalizeSamples } from './renormalization.js';
-export { formatNumber, formatComplex, formatComplexPolar } from './formatting.js';
-export { reactanceToComponent } from './components.js';
-export type { ReactiveComponent } from './components.js';
+export { SmithFormatter } from './SmithFormatter.js';
+export type { ReactiveComponent } from './rf/RfCalculations.js';

package/dist/lib/index.js

@@ -1,9 +1,7 @@
 export { Smith, SmithEventType } from './Smith.js';
-export { Complex } from './complex/Complex.js';
-export { parseTouchstone } from './io/touchstone.js';
+export { Complex } from './math/Complex.js';
+export { Touchstone } from './io/Touchstone.js';
 export { SmithScales } from './scales/SmithScales.js';
-export { compareMarkerReadings } from './measurements.js';
-export { readReflection, reflectionToImpedance, impedanceToReflection, reflectionToAdmittance, admittanceToReflection, } from './rf.js';
-export { renormalizeReflection, renormalizeSamples } from './renormalization.js';
-export { formatNumber, formatComplex, formatComplexPolar } from './formatting.js';
-export { reactanceToComponent } from './components.js';
+export { MarkerMeasurements } from './MarkerMeasurements.js';
+export { RfCalculations } from './rf/RfCalculations.js';
+export { SmithFormatter } from './SmithFormatter.js';

package/dist/lib/{draw → interaction}/SmithCursor.d.ts

@@ -1,6 +1,6 @@
-import { SmithGroup } from './SmithGroup.js';
-import { SmithScaler } from './SmithScaler.js';
-import { Complex } from '../complex/Complex.js';
+import { SmithGroup } from '../svg/SmithGroup.js';
+import { SmithScaler } from '../svg/SmithScaler.js';
+import { Complex } from '../math/Complex.js';
 interface DrawOptions {
     point: {
         radius: number;