chore: fix tests

Author: harbournick

packages/layout-engine/style-engine/src/ooxml/index.ts

@@ -45,13 +45,24 @@ interface StylesIndexCacheEntry {
   styleNames: readonly (string | undefined)[];
 }
 
+interface StylesMapIndexCacheEntry {
+  index: StylesIndex;
+  keys: readonly string[];
+  styleRefs: readonly (StyleDefinition | undefined)[];
+  styleIds: readonly (string | undefined)[];
+  styleNames: readonly (string | undefined)[];
+}
+
+type LegacyStylesMap = Record<string, StyleDefinition>;
+
 /**
  * Module-level cache keyed by style-array reference.
  *
  * The cache also tracks per-item identity and key fields so in-place array
  * mutations (push/splice/reorder/styleId renames) invalidate safely.
  */
 const indexCache = new WeakMap<readonly StyleDefinition[], StylesIndexCacheEntry>();
+const mapIndexCache = new WeakMap<LegacyStylesMap, StylesMapIndexCacheEntry>();
 const EMPTY_STYLES: readonly StyleDefinition[] = [];
 
 function createCacheEntry(styles: readonly StyleDefinition[]): StylesIndexCacheEntry {
@@ -78,23 +89,80 @@ function isCacheEntryValid(styles: readonly StyleDefinition[], entry: StylesInde
   return true;
 }
 
+function isStyleMap(styles: unknown): styles is LegacyStylesMap {
+  return typeof styles === 'object' && styles !== null && !Array.isArray(styles);
+}
+
+function createMapCacheEntry(stylesMap: LegacyStylesMap): StylesMapIndexCacheEntry {
+  const keys = Object.keys(stylesMap);
+  const normalized: StyleDefinition[] = [];
+  const styleRefs: Array<StyleDefinition | undefined> = [];
+  const styleIds: Array<string | undefined> = [];
+  const styleNames: Array<string | undefined> = [];
+
+  for (const key of keys) {
+    const style = stylesMap[key];
+    styleRefs.push(style);
+    styleIds.push(style?.styleId);
+    styleNames.push(style?.name);
+    if (!style) continue;
+    normalized.push(style.styleId ? style : { ...style, styleId: key });
+  }
+
+  return {
+    index: new StylesIndex(normalized),
+    keys,
+    styleRefs,
+    styleIds,
+    styleNames,
+  };
+}
+
+function isMapCacheEntryValid(stylesMap: LegacyStylesMap, entry: StylesMapIndexCacheEntry): boolean {
+  const keys = Object.keys(stylesMap);
+  if (keys.length !== entry.keys.length) {
+    return false;
+  }
+
+  for (let i = 0; i < keys.length; i += 1) {
+    const key = keys[i];
+    if (key !== entry.keys[i]) return false;
+
+    const style = stylesMap[key];
+    if (style !== entry.styleRefs[i]) return false;
+    if (style?.styleId !== entry.styleIds[i]) return false;
+    if (style?.name !== entry.styleNames[i]) return false;
+  }
+
+  return true;
+}
+
 function getStylesIndex(styles: unknown): StylesIndex {
-  // Invariant: normal editor flows (DOCX import and collaboration re-hydration)
-  // normalize style definitions to an ordered array before style resolution.
-  // Non-array input indicates an out-of-contract caller, so treat it as
-  // "no styles" instead of attempting legacy map compatibility here.
-  if (!Array.isArray(styles)) {
-    return new StylesIndex(EMPTY_STYLES);
+  // Primary format is an ordered array, but we still accept legacy map-shaped
+  // catalogs keyed by styleId for backward compatibility.
+  if (Array.isArray(styles)) {
+    const cachedEntry = indexCache.get(styles);
+    if (cachedEntry && isCacheEntryValid(styles, cachedEntry)) {
+      return cachedEntry.index;
+    }
+
+    const entry = createCacheEntry(styles);
+    indexCache.set(styles, entry);
+    return entry.index;
   }
 
-  const cachedEntry = indexCache.get(styles);
-  if (cachedEntry && isCacheEntryValid(styles, cachedEntry)) {
-    return cachedEntry.index;
+  if (isStyleMap(styles)) {
+    const cachedMapEntry = mapIndexCache.get(styles);
+    if (cachedMapEntry && isMapCacheEntryValid(styles, cachedMapEntry)) {
+      return cachedMapEntry.index;
+    }
+
+    const entry = createMapCacheEntry(styles);
+    mapIndexCache.set(styles, entry);
+    return entry.index;
   }
 
-  const entry = createCacheEntry(styles);
-  indexCache.set(styles, entry);
-  return entry.index;
+  return new StylesIndex(EMPTY_STYLES);
 }
 
 export interface OoxmlResolverParams {

packages/layout-engine/style-engine/src/ooxml/table-style-selection.test.ts

@@ -9,11 +9,13 @@ import {
 } from './table-style-selection.ts';
 import type { StylesDocumentProperties } from './styles-types.ts';
 
-const emptyStyles: StylesDocumentProperties = { docDefaults: {}, latentStyles: {}, styles: {} };
+const emptyStyles = { docDefaults: {}, latentStyles: {}, styles: {} } as unknown as StylesDocumentProperties;
 
 const withStyles = (styles: Record<string, { type?: string; default?: boolean }>): StylesDocumentProperties => ({
   ...emptyStyles,
-  styles: Object.fromEntries(Object.entries(styles).map(([id, def]) => [id, { styleId: id, ...def }])),
+  styles: Object.fromEntries(
+    Object.entries(styles).map(([id, def]) => [id, { styleId: id, ...def }]),
+  ) as unknown as StylesDocumentProperties['styles'],
 });
 
 // ──────────────────────────────────────────────────────────────────────────────

packages/layout-engine/style-engine/src/ooxml/table-style-selection.ts

@@ -41,6 +41,23 @@ export interface ResolvedStyle {
   source: ResolvedStyleSource;
 }
 
+function lookupStyleById(
+  styles: StylesDocumentProperties['styles'] | null | undefined,
+  styleId: string,
+): StyleDefinition | undefined {
+  if (!styles) return undefined;
+
+  if (Array.isArray(styles)) {
+    return styles.find((candidate) => candidate.styleId === styleId);
+  }
+
+  const legacyMap = styles as unknown as Record<string, StyleDefinition>;
+  const direct = legacyMap[styleId];
+  if (direct) return direct;
+
+  return Object.values(legacyMap).find((candidate) => candidate?.styleId === styleId);
+}
+
 // ──────────────────────────────────────────────────────────────────────────────
 // Helpers
 // ──────────────────────────────────────────────────────────────────────────────
@@ -53,7 +70,7 @@ export function isKnownTableStyleId(
   translatedLinkedStyles: StylesDocumentProperties | null | undefined,
 ): boolean {
   if (!styleId || !translatedLinkedStyles?.styles) return false;
-  const def = translatedLinkedStyles.styles[styleId];
+  const def = lookupStyleById(translatedLinkedStyles.styles, styleId);
   return def != null && def.type === 'table';
 }
 
@@ -65,11 +82,23 @@ export function findTypeDefaultTableStyleId(
   translatedLinkedStyles: StylesDocumentProperties | null | undefined,
 ): string | null {
   if (!translatedLinkedStyles?.styles) return null;
-  for (const [styleId, def] of Object.entries(translatedLinkedStyles.styles)) {
-    if (def.type === 'table' && def.default === true) {
-      return styleId;
+
+  if (Array.isArray(translatedLinkedStyles.styles)) {
+    for (const def of translatedLinkedStyles.styles) {
+      if (def.type === 'table' && def.default === true && def.styleId) {
+        return def.styleId;
+      }
     }
+    return null;
   }
+
+  const legacyMap = translatedLinkedStyles.styles as unknown as Record<string, StyleDefinition>;
+  for (const [key, def] of Object.entries(legacyMap)) {
+    if (def?.type === 'table' && def.default === true) {
+      return def.styleId ?? key;
+    }
+  }
+
   return null;
 }