@twinfinity/printing 6.0.1-ci.28782-beta → 6.0.2-beta

package/src/layout/legendRows.ts

@@ -1,62 +1,62 @@
-import { getPathValue } from './renderUtils';
-import { parseLegendColor } from './legendUtils';
-
-import { isRecord, getProp } from './typeGuards';
-
-export interface LegendRowOptions {
-    colorKeyPath?: string;
-    classPath?: string;
-}
-
-export interface LegendRow {
-    productId?: string;
-    productName?: string;
-    area?: number | string | null;
-    className?: string | null;
-    x?: number;
-    z?: number;
-    properties?: unknown;
-    propertySets?: unknown;
-    color?: [number, number, number, number];
-    [key: string]: unknown;
-}
-
-/**
- * Build standard legend rows from product items.
- * Expected fields on input item:
- *  - productId / productName / area
- *  - x / z (model coords)
- *  - properties / propertySets
- *  - gid (fallback id)
- */
-export const buildLegendRows = (items: unknown[], options?: LegendRowOptions): LegendRow[] => {
-    const colorKeyPath = options?.colorKeyPath ?? 'productId';
-    return (Array.isArray(items) ? items : []).map((item): LegendRow => {
-        const colorKey = getPathValue(item, colorKeyPath) ?? getProp(item, 'gid') ?? JSON.stringify(item);
-        const itemColor = getProp(item, 'color');
-        const color = parseLegendColor(itemColor, String(colorKey));
-        const classPath = options?.classPath ?? 'ifcClass';
-        const className = (() => {
-            const explicit = getPathValue(item, classPath);
-            if (explicit !== undefined && explicit !== null) return String(explicit);
-            const propSets = getProp(item, 'propertySets');
-            if (isRecord(propSets)) {
-                for (const set of Object.values(propSets)) {
-                    const ifcClassProp = isRecord(set) ? getProp(set, 'ifcClass') : null;
-                    const candidate = isRecord(ifcClassProp) ? getProp(ifcClassProp, 'value') : null;
-                    if (candidate !== undefined && candidate !== null) return String(candidate);
-                }
-            }
-            return null;
-        })();
-        const areaVal = getProp(item, 'area');
-        const area = typeof areaVal === 'number' || typeof areaVal === 'string' ? areaVal : null;
-        const baseObj = isRecord(item) ? (item as Record<string, unknown>) : {};
-        return {
-            ...baseObj,
-            className,
-            area,
-            color
-        };
-    });
-};
+import { getPathValue } from './renderUtils';
+import { parseLegendColor } from './legendUtils';
+
+import { isRecord, getProp } from './typeGuards';
+
+export interface LegendRowOptions {
+    colorKeyPath?: string;
+    classPath?: string;
+}
+
+export interface LegendRow {
+    productId?: string;
+    productName?: string;
+    area?: number | string | null;
+    className?: string | null;
+    x?: number;
+    z?: number;
+    properties?: unknown;
+    propertySets?: unknown;
+    color?: [number, number, number, number];
+    [key: string]: unknown;
+}
+
+/**
+ * Build standard legend rows from product items.
+ * Expected fields on input item:
+ *  - productId / productName / area
+ *  - x / z (model coords)
+ *  - properties / propertySets
+ *  - gid (fallback id)
+ */
+export const buildLegendRows = (items: unknown[], options?: LegendRowOptions): LegendRow[] => {
+    const colorKeyPath = options?.colorKeyPath ?? 'productId';
+    return (Array.isArray(items) ? items : []).map((item): LegendRow => {
+        const colorKey = getPathValue(item, colorKeyPath) ?? getProp(item, 'gid') ?? JSON.stringify(item);
+        const itemColor = getProp(item, 'color');
+        const color = parseLegendColor(itemColor, String(colorKey));
+        const classPath = options?.classPath ?? 'ifcClass';
+        const className = (() => {
+            const explicit = getPathValue(item, classPath);
+            if (explicit !== undefined && explicit !== null) return String(explicit);
+            const propSets = getProp(item, 'propertySets');
+            if (isRecord(propSets)) {
+                for (const set of Object.values(propSets)) {
+                    const ifcClassProp = isRecord(set) ? getProp(set, 'ifcClass') : null;
+                    const candidate = isRecord(ifcClassProp) ? getProp(ifcClassProp, 'value') : null;
+                    if (candidate !== undefined && candidate !== null) return String(candidate);
+                }
+            }
+            return null;
+        })();
+        const areaVal = getProp(item, 'area');
+        const area = typeof areaVal === 'number' || typeof areaVal === 'string' ? areaVal : null;
+        const baseObj = isRecord(item) ? (item as Record<string, unknown>) : {};
+        return {
+            ...baseObj,
+            className,
+            area,
+            color
+        };
+    });
+};

package/src/layout/legendUtils.ts

@@ -1,144 +1,144 @@
-import {
-    LEGEND_TEXT_WIDTH_FACTOR,
-    LEGEND_MIN_CONTENT_WIDTH_EM,
-    LEGEND_TEXT_Y_OFFSET_FACTOR,
-    PX_PER_MM
-} from './legendConstants';
-// v2 format: { digits?: number; prefix?: string; suffix?: string } or undefined
-type LegendFormat = { digits?: number; prefix?: string; suffix?: string } | string | undefined;
-import {
-    RGB_MAX,
-    RED_SHIFT,
-    GREEN_SHIFT,
-    HASH_COLOR_MODULO,
-    HASH_GREEN_SHIFT,
-    HASH_BLUE_SHIFT,
-    RGB_MIN
-} from './colorConstants';
-
-import { isRecord, getProp } from './typeGuards';
-
-export function parseLegendColor(value: unknown, fallbackKey: string): [number, number, number, number] {
-    if (Array.isArray(value) && (value.length === 3 || value.length === 4)) {
-        const [r, g, b, a = RGB_MAX] = value.map((v) => Number(v) || 0);
-        return [clampColor(r), clampColor(g), clampColor(b), clampColor(a)];
-    }
-    if (typeof value === 'string') {
-        const hex = value.trim();
-        const match = /^#?([a-fA-F0-9]{6})([a-fA-F0-9]{2})?$/.exec(hex);
-        if (match) {
-            const intVal = parseInt(match[1], 16);
-            const aHex = match[2];
-            return [
-                (intVal >> RED_SHIFT) & 0xff,
-                (intVal >> GREEN_SHIFT) & 0xff,
-                intVal & 0xff,
-                aHex ? parseInt(aHex, 16) : RGB_MAX
-            ];
-        }
-    }
-    const hash = Math.abs(hashCode(fallbackKey || ''));
-    return [
-        hash % HASH_COLOR_MODULO,
-        (hash >> HASH_GREEN_SHIFT) % HASH_COLOR_MODULO,
-        (hash >> HASH_BLUE_SHIFT) % HASH_COLOR_MODULO,
-        RGB_MAX
-    ];
-}
-
-export function formatLegendValue(value: unknown, fmt?: LegendFormat): string {
-    if (fmt === undefined || fmt === null || fmt === 'string') {
-        return value === undefined || value === null ? '' : String(value);
-    }
-
-    if (typeof fmt === 'string') {
-        const fixedMatch = /^fixed\((\d+)(?:,\s*([^)]*))?\)$/i.exec(fmt);
-        if (fixedMatch) {
-            const digits = parseInt(fixedMatch[1], 10);
-            const suffix = fixedMatch[2] || '';
-            const num = Number(value);
-            if (Number.isFinite(num)) {
-                return `${num.toFixed(digits)}${suffix ? ` ${suffix.trim()}` : ''}`.trim();
-            }
-        }
-        return String(value ?? '');
-    }
-
-    if (isRecord(fmt)) {
-        const digits = getProp(fmt, 'digits');
-        const prefix = getProp(fmt, 'prefix');
-        const suffix = getProp(fmt, 'suffix');
-        const num = Number(value);
-        if (Number.isFinite(num) && typeof digits === 'number') {
-            const prefixStr = typeof prefix === 'string' ? prefix : '';
-            const suffixStr = typeof suffix === 'string' ? suffix : '';
-            return `${prefixStr}${num.toFixed(digits)}${suffixStr}`;
-        }
-        return String(value ?? '');
-    }
-
-    return String(value ?? '');
-}
-
-export function computeLegendColumnWidths(
-    columnLabels: { label: string; minWidthMm?: number; maxWidthMm?: number }[],
-    rows: { values: string[] }[],
-    fontSizeMm: number,
-    cellPaddingMm: number,
-    swatchWidthMm: number,
-    fontFamily: string
-): { colWidthsMm: number[]; columnCount: number } {
-    const columnCount = Math.min(6, Math.max(2, columnLabels.length + 1));
-    const colWidthsMm: number[] = new Array(columnCount).fill(0);
-    colWidthsMm[0] = swatchWidthMm;
-    const measureTextWidthMm = createLegendTextMeasurer(fontFamily, fontSizeMm);
-
-    for (let c = 1; c < columnCount; c++) {
-        const colIdx = c - 1;
-        const col = columnLabels[colIdx];
-        const minWidth = col.minWidthMm ?? fontSizeMm * LEGEND_MIN_CONTENT_WIDTH_EM;
-        const maxWidth = col.maxWidthMm ?? Number.POSITIVE_INFINITY;
-        let maxWidthMeasured = measureTextWidthMm(col.label ?? '');
-        rows.forEach((row) => {
-            const text = row.values[colIdx] ?? '';
-            maxWidthMeasured = Math.max(maxWidthMeasured, measureTextWidthMm(text));
-        });
-        const contentWidth = Math.max(minWidth, Math.min(maxWidth, maxWidthMeasured + cellPaddingMm * 2));
-        colWidthsMm[c] = contentWidth;
-    }
-
-    return { colWidthsMm, columnCount };
-}
-
-export function computeLegendTextYOffset(fontSizeMm: number): number {
-    return fontSizeMm * LEGEND_TEXT_Y_OFFSET_FACTOR;
-}
-
-export const createLegendTextMeasurer = (fontFamily: string, fontSizeMm: number): ((text: string) => number) => {
-    if (typeof document !== 'undefined') {
-        const canvas = document.createElement('canvas');
-        canvas.width = 1024;
-        canvas.height = 64;
-        const canvasCtx = canvas.getContext('2d');
-        if (canvasCtx) {
-            canvasCtx.font = `${fontSizeMm * PX_PER_MM}px ${fontFamily}`;
-            const measureTextWidthMm = (text: string): number => {
-                const metrics = canvasCtx.measureText(text);
-                return metrics.width / PX_PER_MM;
-            };
-            return measureTextWidthMm;
-        }
-    }
-    return (text: string): number => text.length * fontSizeMm * LEGEND_TEXT_WIDTH_FACTOR;
-};
-
-const clampColor = (value: number): number => Math.max(RGB_MIN, Math.min(RGB_MAX, Math.round(value)));
-
-const hashCode = (str: string): number => {
-    let hash = 0;
-    for (let i = 0; i < str.length; i++) {
-        hash = (hash << 5) - hash + str.charCodeAt(i);
-        hash |= 0;
-    }
-    return hash;
-};
+import {
+    LEGEND_TEXT_WIDTH_FACTOR,
+    LEGEND_MIN_CONTENT_WIDTH_EM,
+    LEGEND_TEXT_Y_OFFSET_FACTOR,
+    PX_PER_MM
+} from './legendConstants';
+// v2 format: { digits?: number; prefix?: string; suffix?: string } or undefined
+type LegendFormat = { digits?: number; prefix?: string; suffix?: string } | string | undefined;
+import {
+    RGB_MAX,
+    RED_SHIFT,
+    GREEN_SHIFT,
+    HASH_COLOR_MODULO,
+    HASH_GREEN_SHIFT,
+    HASH_BLUE_SHIFT,
+    RGB_MIN
+} from './colorConstants';
+
+import { isRecord, getProp } from './typeGuards';
+
+export function parseLegendColor(value: unknown, fallbackKey: string): [number, number, number, number] {
+    if (Array.isArray(value) && (value.length === 3 || value.length === 4)) {
+        const [r, g, b, a = RGB_MAX] = value.map((v) => Number(v) || 0);
+        return [clampColor(r), clampColor(g), clampColor(b), clampColor(a)];
+    }
+    if (typeof value === 'string') {
+        const hex = value.trim();
+        const match = /^#?([a-fA-F0-9]{6})([a-fA-F0-9]{2})?$/.exec(hex);
+        if (match) {
+            const intVal = parseInt(match[1], 16);
+            const aHex = match[2];
+            return [
+                (intVal >> RED_SHIFT) & 0xff,
+                (intVal >> GREEN_SHIFT) & 0xff,
+                intVal & 0xff,
+                aHex ? parseInt(aHex, 16) : RGB_MAX
+            ];
+        }
+    }
+    const hash = Math.abs(hashCode(fallbackKey || ''));
+    return [
+        hash % HASH_COLOR_MODULO,
+        (hash >> HASH_GREEN_SHIFT) % HASH_COLOR_MODULO,
+        (hash >> HASH_BLUE_SHIFT) % HASH_COLOR_MODULO,
+        RGB_MAX
+    ];
+}
+
+export function formatLegendValue(value: unknown, fmt?: LegendFormat): string {
+    if (fmt === undefined || fmt === null || fmt === 'string') {
+        return value === undefined || value === null ? '' : String(value);
+    }
+
+    if (typeof fmt === 'string') {
+        const fixedMatch = /^fixed\((\d+)(?:,\s*([^)]*))?\)$/i.exec(fmt);
+        if (fixedMatch) {
+            const digits = parseInt(fixedMatch[1], 10);
+            const suffix = fixedMatch[2] || '';
+            const num = Number(value);
+            if (Number.isFinite(num)) {
+                return `${num.toFixed(digits)}${suffix ? ` ${suffix.trim()}` : ''}`.trim();
+            }
+        }
+        return String(value ?? '');
+    }
+
+    if (isRecord(fmt)) {
+        const digits = getProp(fmt, 'digits');
+        const prefix = getProp(fmt, 'prefix');
+        const suffix = getProp(fmt, 'suffix');
+        const num = Number(value);
+        if (Number.isFinite(num) && typeof digits === 'number') {
+            const prefixStr = typeof prefix === 'string' ? prefix : '';
+            const suffixStr = typeof suffix === 'string' ? suffix : '';
+            return `${prefixStr}${num.toFixed(digits)}${suffixStr}`;
+        }
+        return String(value ?? '');
+    }
+
+    return String(value ?? '');
+}
+
+export function computeLegendColumnWidths(
+    columnLabels: { label: string; minWidthMm?: number; maxWidthMm?: number }[],
+    rows: { values: string[] }[],
+    fontSizeMm: number,
+    cellPaddingMm: number,
+    swatchWidthMm: number,
+    fontFamily: string
+): { colWidthsMm: number[]; columnCount: number } {
+    const columnCount = Math.min(6, Math.max(2, columnLabels.length + 1));
+    const colWidthsMm: number[] = new Array(columnCount).fill(0);
+    colWidthsMm[0] = swatchWidthMm;
+    const measureTextWidthMm = createLegendTextMeasurer(fontFamily, fontSizeMm);
+
+    for (let c = 1; c < columnCount; c++) {
+        const colIdx = c - 1;
+        const col = columnLabels[colIdx];
+        const minWidth = col.minWidthMm ?? fontSizeMm * LEGEND_MIN_CONTENT_WIDTH_EM;
+        const maxWidth = col.maxWidthMm ?? Number.POSITIVE_INFINITY;
+        let maxWidthMeasured = measureTextWidthMm(col.label ?? '');
+        rows.forEach((row) => {
+            const text = row.values[colIdx] ?? '';
+            maxWidthMeasured = Math.max(maxWidthMeasured, measureTextWidthMm(text));
+        });
+        const contentWidth = Math.max(minWidth, Math.min(maxWidth, maxWidthMeasured + cellPaddingMm * 2));
+        colWidthsMm[c] = contentWidth;
+    }
+
+    return { colWidthsMm, columnCount };
+}
+
+export function computeLegendTextYOffset(fontSizeMm: number): number {
+    return fontSizeMm * LEGEND_TEXT_Y_OFFSET_FACTOR;
+}
+
+export const createLegendTextMeasurer = (fontFamily: string, fontSizeMm: number): ((text: string) => number) => {
+    if (typeof document !== 'undefined') {
+        const canvas = document.createElement('canvas');
+        canvas.width = 1024;
+        canvas.height = 64;
+        const canvasCtx = canvas.getContext('2d');
+        if (canvasCtx) {
+            canvasCtx.font = `${fontSizeMm * PX_PER_MM}px ${fontFamily}`;
+            const measureTextWidthMm = (text: string): number => {
+                const metrics = canvasCtx.measureText(text);
+                return metrics.width / PX_PER_MM;
+            };
+            return measureTextWidthMm;
+        }
+    }
+    return (text: string): number => text.length * fontSizeMm * LEGEND_TEXT_WIDTH_FACTOR;
+};
+
+const clampColor = (value: number): number => Math.max(RGB_MIN, Math.min(RGB_MAX, Math.round(value)));
+
+const hashCode = (str: string): number => {
+    let hash = 0;
+    for (let i = 0; i < str.length; i++) {
+        hash = (hash << 5) - hash + str.charCodeAt(i);
+        hash |= 0;
+    }
+    return hash;
+};