@abraca/dabra 1.8.2 → 1.9.1

package/src/DocTypes.ts

@@ -0,0 +1,618 @@
+/**
+ * Canonical type definitions for Abracadabra document tree entries, page
+ * metadata, and the static page-type catalog.
+ *
+ * These types were previously scattered across `mcp/converters/types.ts` and
+ * `mcp/converters/page-types.ts`.  By living in the provider package they
+ * become first-class SDK types that any consumer (`@abraca/dabra`) can import
+ * directly, removing the need for fragile relative-path re-exports.
+ */
+
+// ── Meta field primitives ────────────────────────────────────────────────────
+
+export type MetaFieldType
+  = | 'datetimerange'
+    | 'daterange'
+    | 'timerange'
+    | 'datetime'
+    | 'date'
+    | 'time'
+    | 'slider'
+    | 'number'
+    | 'toggle'
+    | 'select'
+    | 'multiselect'
+    | 'colorPreset'
+    | 'colorPicker'
+    | 'location'
+    | 'icon'
+    | 'textarea'
+    | 'url'
+    | 'rating'
+    | 'tags'
+    | 'members'
+
+export interface UserMetaField {
+  id: string
+  type: string
+  label?: string
+  key?: string
+  latKey?: string
+  lngKey?: string
+  startKey?: string
+  endKey?: string
+  allDayKey?: string
+  presets?: string[]
+  options?: string[]
+  min?: number
+  max?: number
+  step?: number
+  unit?: string
+  default?: boolean
+}
+
+// ── PageMeta — the full union of all metadata fields ─────────────────────────
+
+export interface PageMeta extends Record<string, unknown> {
+  // Universal display
+  color?: string
+  icon?: string
+  subtitle?: string
+  note?: string
+
+  // Datetime
+  datetimeStart?: string
+  datetimeEnd?: string
+  allDay?: boolean
+  dateStart?: string
+  dateEnd?: string
+  timeStart?: string
+  timeEnd?: string
+  dateTaken?: string
+
+  // Task/status
+  checked?: boolean
+  priority?: number
+  status?: string
+  taskProgress?: number
+  rating?: number
+  tags?: string[]
+  members?: { id: string; label: string }[]
+
+  // Contact/value
+  url?: string
+  email?: string
+  phone?: string
+  number?: number
+  unit?: string
+
+  // Cover image
+  coverUploadId?: string
+  coverDocId?: string
+  coverMimeType?: string
+
+  // Geo/Map
+  geoType?: 'marker' | 'line' | 'measure'
+  geoLat?: number
+  geoLng?: number
+  geoDescription?: string
+
+  // Dashboard
+  deskX?: number
+  deskY?: number
+  deskZ?: number
+  deskMode?: string
+
+  // Mindmap
+  mmX?: number
+  mmY?: number
+
+  // Graph
+  graphX?: number
+  graphY?: number
+  graphPinned?: boolean
+
+  // Spatial (3D) — spatial uses the universal `color` key (no spColor)
+  spShape?: string
+  spOpacity?: number
+  spX?: number
+  spY?: number
+  spZ?: number
+  spRX?: number
+  spRY?: number
+  spRZ?: number
+  spSX?: number
+  spSY?: number
+  spSZ?: number
+  spModelUploadId?: string
+  spModelDocId?: string
+
+  // Slides
+  slidesTransition?: string
+  slidesTheme?: string
+
+  // Media metadata (extracted on import)
+  mediaDuration?: number
+  mediaWidth?: number
+  mediaHeight?: number
+  mediaCamera?: string
+  mediaLens?: string
+  mediaIso?: number
+  mediaFocalLength?: number
+  mediaAperture?: number
+  mediaShutterSpeed?: string
+  mediaArtist?: string
+  mediaAlbum?: string
+  mediaGenre?: string
+  mediaYear?: number
+
+  // Sheets cell formatting
+  bold?: boolean
+  italic?: boolean
+  textColor?: string
+  bgColor?: string
+  align?: string
+  formula?: string
+
+  // Coder plugin (per-file)
+  fileType?: string
+  entry?: boolean
+
+  // Renderer config (set on the page doc itself, not children)
+  kanbanColumnWidth?: string
+  galleryColumns?: number
+  galleryAspect?: string
+  galleryCardStyle?: string
+  galleryShowLabels?: boolean
+  gallerySortBy?: string
+  calendarView?: string
+  calendarWeekStart?: string
+  calendarShowWeekNumbers?: boolean
+  tableMode?: string
+  tableSortKey?: string
+  tableSortDir?: string
+  tableColumns?: any[]
+  tableColumnWidths?: Record<string, number>
+  tableColumnOrder?: string[]
+  timelineZoom?: string
+  timelinePixelsPerDay?: number
+  timelineCenterDate?: string
+  checklistFilter?: string
+  checklistSort?: string
+  mapShowLabels?: boolean
+  spatialGridVisible?: boolean
+  graphSpacing?: string
+  graphShowLabels?: boolean
+  graphEdgeThickness?: string
+  mmSpacing?: string
+  showRefEdges?: boolean
+  chartType?: string
+  chartMetric?: string
+  chartColorScheme?: string
+  chartLimit?: number
+  chartShowLegend?: boolean
+  chartShowValues?: boolean
+  mediaRepeat?: string
+  mediaShuffle?: boolean
+  sheetsDefaultColWidth?: number
+  sheetsDefaultRowHeight?: number
+  sheetsShowGridlines?: boolean
+  sheetsColumnWidths?: Record<string, number>
+  sheetsRowHeights?: Record<string, number>
+  sheetsFreezeRows?: number
+  sheetsFreezeCols?: number
+
+  // Internal
+  _metaFields?: UserMetaField[]
+  _metaInitialized?: boolean
+}
+
+// ── Tree entry (flat row in the doc-tree Y.Map) ──────────────────────────────
+
+export interface TreeEntry {
+  id: string
+  label: string
+  parentId: string | null
+  order: number
+  type?: string
+  meta?: PageMeta
+  createdAt?: number
+  updatedAt?: number
+}
+
+// ── Tree node (nested, for buildTree output) ─────────────────────────────────
+
+export interface TreeNode {
+  id: string
+  label: string
+  type?: string
+  meta?: PageMeta
+  order: number
+  children: TreeNode[]
+}
+
+// ── Search result (from TreeManager.find) ────────────────────────────────────
+
+export interface TreeSearchResult {
+  id: string
+  label: string
+  type?: string
+  meta?: PageMeta
+  /** Ancestor labels from root → parent. */
+  path: string[]
+}
+
+// ── Page type catalog ────────────────────────────────────────────────────────
+
+export interface PageTypeMetaField {
+  type: MetaFieldType
+  label?: string
+  /** single-value fields */
+  key?: string
+  /** location */
+  latKey?: string
+  lngKey?: string
+  /** ranges */
+  startKey?: string
+  endKey?: string
+  allDayKey?: string
+  /** color preset */
+  presets?: string[]
+  /** icon / select / tags */
+  options?: string[]
+  /** slider / number */
+  min?: number
+  max?: number
+  step?: number
+  unit?: string
+  /** toggle default */
+  default?: boolean
+}
+
+export interface PageTypeInfo {
+  key: string
+  label: string
+  icon: string
+  description?: string
+  /** true = core type (always available); false = requires plugin */
+  core: boolean
+  plugin?: string
+  supportsChildren: boolean
+  childLabel?: string
+  grandchildLabel?: string
+  /** -1 = unlimited depth */
+  defaultDepth?: number
+  /** Fields that apply to this doc's descendants (children, grandchildren, ...) */
+  metaSchema?: PageTypeMetaField[]
+  /** Fields written to this doc's own meta on first render (renderer config) */
+  defaultMetaFields?: PageTypeMetaField[]
+}
+
+// ── Geo type meta schemas ────────────────────────────────────────────────────
+
+const GEO_COLOR_PRESETS = ['#3b82f6', '#f97316', '#22c55e', '#ef4444', '#a855f7']
+const GEO_ICON_OPTIONS = [
+  'map-pin', 'star', 'flag', 'home', 'building-2', 'coffee', 'utensils',
+  'camera', 'heart', 'zap', 'triangle-alert', 'car', 'plane', 'anchor',
+  'tree-pine', 'mountain', 'waves', 'shield', 'crosshair', 'circle-dot',
+  'bookmark', 'gem', 'radio', 'compass',
+]
+
+export const GEO_TYPE_META_SCHEMAS: Record<string, PageTypeMetaField[]> = {
+  marker: [
+    { type: 'location', latKey: 'geoLat', lngKey: 'geoLng', label: 'Location' },
+    { type: 'icon', key: 'icon', options: GEO_ICON_OPTIONS, label: 'Icon' },
+    { type: 'colorPreset', key: 'color', presets: GEO_COLOR_PRESETS, label: 'Color' },
+  ],
+  line: [
+    { type: 'colorPreset', key: 'color', presets: GEO_COLOR_PRESETS, label: 'Color' },
+  ],
+  measure: [],
+}
+
+// ── Static page type registry ────────────────────────────────────────────────
+
+export const PAGE_TYPES: Record<string, PageTypeInfo> = {
+  doc: {
+    key: 'doc',
+    label: 'Document',
+    icon: 'file-text',
+    description: 'Rich text document with real-time collaboration',
+    core: true,
+    supportsChildren: true,
+  },
+  kanban: {
+    key: 'kanban',
+    label: 'Kanban',
+    icon: 'kanban',
+    description: 'Drag-and-drop task board with columns and cards',
+    core: true,
+    supportsChildren: true,
+    childLabel: 'Column',
+    grandchildLabel: 'Card',
+    defaultMetaFields: [
+      { type: 'select', key: 'kanbanColumnWidth', options: ['narrow', 'default', 'wide'], label: 'Column Width' },
+    ],
+  },
+  gallery: {
+    key: 'gallery',
+    label: 'Gallery',
+    icon: 'images',
+    description: 'Visual grid of items with rich content',
+    core: true,
+    supportsChildren: true,
+    childLabel: 'Item',
+    metaSchema: [
+      { type: 'location', latKey: 'geoLat', lngKey: 'geoLng', label: 'Location' },
+      { type: 'datetime', key: 'datetimeStart', label: 'Date' },
+      { type: 'tags', key: 'tags', label: 'Tags' },
+      { type: 'rating', key: 'rating', max: 5, label: 'Rating' },
+      { type: 'icon', key: 'icon', label: 'Icon' },
+      { type: 'colorPreset', key: 'color', presets: ['#6366f1', '#ec4899', '#f97316', '#22c55e', '#3b82f6', '#a855f7'], label: 'Color' },
+    ],
+    defaultMetaFields: [
+      { type: 'number', key: 'galleryColumns', min: 1, max: 6, step: 1, label: 'Columns' },
+      { type: 'select', key: 'galleryAspect', options: ['square', '4:3', '3:2', '16:9', 'free'], label: 'Aspect Ratio' },
+      { type: 'select', key: 'galleryCardStyle', options: ['default', 'compact', 'detailed'], label: 'Card Style' },
+      { type: 'toggle', key: 'galleryShowLabels', label: 'Show Labels' },
+      { type: 'select', key: 'gallerySortBy', options: ['manual', 'date', 'name', 'rating'], label: 'Sort' },
+    ],
+  },
+  table: {
+    key: 'table',
+    label: 'Table',
+    icon: 'table',
+    description: 'Collaborative spreadsheet with custom fields',
+    core: true,
+    supportsChildren: true,
+    childLabel: 'Column',
+    grandchildLabel: 'Row',
+    defaultMetaFields: [
+      { type: 'select', key: 'tableMode', options: ['hierarchy', 'flat'], label: 'Mode' },
+      { type: 'select', key: 'tableSortDir', options: ['asc', 'desc'], label: 'Sort Direction' },
+    ],
+  },
+  outline: {
+    key: 'outline',
+    label: 'Outline',
+    icon: 'list-tree',
+    description: 'Hierarchical outline with keyboard navigation',
+    core: true,
+    supportsChildren: true,
+    childLabel: 'Item',
+    defaultDepth: -1,
+  },
+  checklist: {
+    key: 'checklist',
+    label: 'Checklist',
+    icon: 'check-square',
+    description: 'Collaborative checklist with sub-tasks, drag-and-drop, and due dates',
+    core: true,
+    supportsChildren: true,
+    childLabel: 'Task',
+    defaultDepth: -1,
+    metaSchema: [
+      { type: 'toggle', key: 'checked', label: 'Done' },
+      { type: 'select', key: 'priority', options: ['none', 'low', 'medium', 'high'], label: 'Priority' },
+      { type: 'date', key: 'dateEnd', label: 'Due date' },
+    ],
+    defaultMetaFields: [
+      { type: 'select', key: 'checklistFilter', options: ['all', 'active', 'completed'], label: 'Filter' },
+      { type: 'select', key: 'checklistSort', options: ['manual', 'priority', 'due'], label: 'Sort' },
+    ],
+  },
+  graph: {
+    key: 'graph',
+    label: 'Graph',
+    icon: 'git-fork',
+    description: 'Force-directed knowledge graph — full document tree as nodes & edges',
+    core: true,
+    supportsChildren: true,
+    childLabel: 'Node',
+    defaultMetaFields: [
+      { type: 'toggle', key: 'showRefEdges', label: 'Show Ref Edges', default: true },
+    ],
+  },
+  timeline: {
+    key: 'timeline',
+    label: 'Timeline',
+    icon: 'gantt-chart',
+    description: 'Gantt-style project timeline with epics and tasks',
+    core: true,
+    supportsChildren: true,
+    childLabel: 'Epic',
+    grandchildLabel: 'Task',
+    metaSchema: [
+      { type: 'daterange', startKey: 'dateStart', endKey: 'dateEnd' },
+      { type: 'slider', key: 'taskProgress', min: 0, max: 100, label: 'Progress' },
+      { type: 'colorPreset', key: 'color', presets: ['#6366f1', '#818cf8', '#f97316', '#22c55e', '#3b82f6', '#a855f7'], label: 'Color' },
+    ],
+  },
+  calendar: {
+    key: 'calendar',
+    label: 'Calendar',
+    icon: 'calendar',
+    description: 'Event calendar with month, week, and day views',
+    core: true,
+    supportsChildren: true,
+    childLabel: 'Event',
+    metaSchema: [
+      { type: 'datetimerange', startKey: 'datetimeStart', endKey: 'datetimeEnd', allDayKey: 'allDay' },
+      { type: 'colorPreset', key: 'color', presets: ['#6366f1', '#ec4899', '#f97316', '#22c55e', '#3b82f6', '#a855f7'], label: 'Color' },
+      { type: 'icon', key: 'icon', label: 'Icon' },
+    ],
+    defaultMetaFields: [
+      { type: 'select', key: 'calendarWeekStart', options: ['sun', 'mon'], label: 'Week Starts' },
+      { type: 'select', key: 'calendarView', options: ['month', 'week', 'day'], label: 'Default View' },
+      { type: 'toggle', key: 'calendarShowWeekNumbers', label: 'Show Week Numbers' },
+    ],
+  },
+  map: {
+    key: 'map',
+    label: 'Map',
+    icon: 'map',
+    description: 'Collaborative world map with shared markers',
+    core: true,
+    supportsChildren: true,
+    childLabel: 'Location',
+    defaultMetaFields: [
+      { type: 'toggle', key: 'mapShowLabels', label: 'Show Labels', default: true },
+    ],
+  },
+  dashboard: {
+    key: 'dashboard',
+    label: 'Dashboard',
+    icon: 'layout-dashboard',
+    description: 'Arrange documents as draggable icons with optional widget views',
+    core: true,
+    supportsChildren: true,
+    childLabel: 'Item',
+  },
+  call: {
+    key: 'call',
+    label: 'Call',
+    icon: 'phone',
+    description: 'Video call room with live audio and screen sharing',
+    core: true,
+    supportsChildren: false,
+  },
+  chart: {
+    key: 'chart',
+    label: 'Chart',
+    icon: 'bar-chart-3',
+    description: 'Charts — manual data points or aggregation over document trees',
+    core: true,
+    supportsChildren: true,
+    childLabel: 'Data Point',
+    grandchildLabel: 'Data Point',
+    metaSchema: [
+      { type: 'number', key: 'number', step: 0.01, label: 'Value' },
+      { type: 'colorPreset', key: 'color', presets: ['#6366f1', '#ec4899', '#f97316', '#22c55e', '#3b82f6', '#a855f7', '#14b8a6', '#eab308'], label: 'Color' },
+      { type: 'tags', key: 'tags', label: 'Tags' },
+    ],
+    defaultMetaFields: [
+      { type: 'select', key: 'chartType', options: ['bar', 'stacked bar', 'line', 'donut', 'treemap'], label: 'Chart Type' },
+      { type: 'select', key: 'chartMetric', options: ['value', 'type', 'tag', 'status', 'priority', 'activity', 'completion'], label: 'Metric' },
+      { type: 'select', key: 'chartColorScheme', options: ['default', 'warm', 'cool', 'mono'], label: 'Colors' },
+      { type: 'number', key: 'chartLimit', min: 3, max: 30, step: 1, label: 'Max Items' },
+      { type: 'toggle', key: 'chartShowLegend', label: 'Show Legend', default: true },
+      { type: 'toggle', key: 'chartShowValues', label: 'Show Values' },
+    ],
+  },
+  sheets: {
+    key: 'sheets',
+    label: 'Sheets',
+    icon: 'grid-3x3',
+    description: 'Spreadsheet — cells, formulas, and formatting in a collaborative grid',
+    core: true,
+    supportsChildren: true,
+    childLabel: 'Column',
+    grandchildLabel: 'Cell',
+    defaultMetaFields: [
+      { type: 'number', key: 'sheetsDefaultColWidth', min: 40, max: 500, step: 10, label: 'Column Width' },
+      { type: 'number', key: 'sheetsDefaultRowHeight', min: 20, max: 100, step: 2, label: 'Row Height' },
+      { type: 'toggle', key: 'sheetsShowGridlines', label: 'Gridlines' },
+    ],
+  },
+  slides: {
+    key: 'slides',
+    label: 'Slides',
+    icon: 'presentation',
+    description: 'Presentation slides with two-axis navigation',
+    core: true,
+    supportsChildren: true,
+    childLabel: 'Slide',
+    grandchildLabel: 'Sub-slide',
+    metaSchema: [
+      { type: 'select', key: 'slidesTransition', options: ['none', 'fade', 'slide'], label: 'Transition' },
+      { type: 'colorPreset', key: 'color', presets: ['#6366f1', '#ec4899', '#f97316', '#22c55e', '#3b82f6', '#a855f7'], label: 'Accent' },
+    ],
+    defaultMetaFields: [
+      { type: 'select', key: 'slidesTheme', options: ['dark', 'light'], label: 'Theme' },
+    ],
+  },
+  overview: {
+    key: 'overview',
+    label: 'Overview',
+    icon: 'radar',
+    description: 'Space home — activity, people, stats, and health at a glance',
+    core: true,
+    supportsChildren: true,
+    childLabel: 'Page',
+  },
+
+  // Plugin-contributed types — require the named plugin to be enabled server-side.
+
+  spatial: {
+    key: 'spatial',
+    label: 'Spatial',
+    icon: 'box',
+    description: '3D scene with collaborative objects and real-time presence',
+    core: false,
+    plugin: 'spatial',
+    supportsChildren: true,
+    childLabel: 'Object',
+    grandchildLabel: 'Part',
+    defaultDepth: -1,
+    metaSchema: [
+      { type: 'select', key: 'spShape', options: ['box', 'sphere', 'cylinder', 'cone', 'plane', 'torus', 'glb'], label: 'Shape' },
+      { type: 'colorPreset', key: 'color', presets: ['#6366f1', '#ef4444', '#22c55e', '#3b82f6', '#f97316', '#a855f7', '#ec4899', '#14b8a6'], label: 'Color' },
+      { type: 'slider', key: 'spOpacity', min: 0, max: 100, label: 'Opacity' },
+      { type: 'number', key: 'spX', step: 0.1, label: 'X' },
+      { type: 'number', key: 'spY', step: 0.1, label: 'Y' },
+      { type: 'number', key: 'spZ', step: 0.1, label: 'Z' },
+      { type: 'number', key: 'spRX', min: -180, max: 180, step: 1, label: 'Rot X' },
+      { type: 'number', key: 'spRY', min: -180, max: 180, step: 1, label: 'Rot Y' },
+      { type: 'number', key: 'spRZ', min: -180, max: 180, step: 1, label: 'Rot Z' },
+      { type: 'number', key: 'spSX', min: 0.01, max: 100, step: 0.1, label: 'Scale X' },
+      { type: 'number', key: 'spSY', min: 0.01, max: 100, step: 0.1, label: 'Scale Y' },
+      { type: 'number', key: 'spSZ', min: 0.01, max: 100, step: 0.1, label: 'Scale Z' },
+    ],
+    defaultMetaFields: [
+      { type: 'toggle', key: 'spatialGridVisible', label: 'Show Grid', default: true },
+    ],
+  },
+  media: {
+    key: 'media',
+    label: 'Media',
+    icon: 'disc-3',
+    description: 'Media player with synced listening and playlists',
+    core: false,
+    plugin: 'media',
+    supportsChildren: true,
+    childLabel: 'Track',
+    defaultDepth: -1,
+    metaSchema: [
+      { type: 'tags', key: 'tags', label: 'Tags' },
+    ],
+    defaultMetaFields: [
+      { type: 'select', key: 'mediaRepeat', options: ['off', 'all', 'one'], label: 'Repeat' },
+      { type: 'toggle', key: 'mediaShuffle', label: 'Shuffle' },
+    ],
+  },
+  coder: {
+    key: 'coder',
+    label: 'Coder',
+    icon: 'code-2',
+    description: 'Collaborative multi-file coding environment',
+    core: false,
+    plugin: 'coder',
+    supportsChildren: true,
+    childLabel: 'File',
+    defaultDepth: -1,
+    metaSchema: [
+      { type: 'select', key: 'fileType', options: ['vue', 'ts', 'js', 'css', 'json', 'folder'], label: 'Type' },
+      { type: 'toggle', key: 'entry', label: 'Entry Point' },
+    ],
+  },
+}
+
+export const TYPE_ALIASES: Record<string, string> = {
+  desktop: 'dashboard',
+}
+
+export function resolvePageType(key: string | undefined): PageTypeInfo | undefined {
+  if (!key) return undefined
+  const resolved = TYPE_ALIASES[key] ?? key
+  return PAGE_TYPES[resolved]
+}

package/src/DocUtils.ts

@@ -0,0 +1,89 @@
+/**
+ * Shared utilities for the DocumentManager ORM layer.
+ *
+ * These functions were previously duplicated across `mcp/src/utils.ts`,
+ * `mcp/src/server.ts`, `cli/src/connection.ts`, and `mcp/src/tools/tree.ts`.
+ */
+import * as Y from "yjs";
+
+/**
+ * Wait for a provider's `synced` event with a timeout.
+ * Resolves immediately if the provider is already synced.
+ */
+export function waitForSync(
+	provider: {
+		isSynced?: boolean;
+		on(event: string, cb: () => void): void;
+		off(event: string, cb: () => void): void;
+	},
+	timeoutMs = 15000,
+): Promise<void> {
+	// Already synced — resolve immediately.
+	if (provider.isSynced) return Promise.resolve();
+
+	return new Promise<void>((resolve, reject) => {
+		const timer = setTimeout(() => {
+			provider.off("synced", handler);
+			reject(new Error(`Sync timed out after ${timeoutMs}ms`));
+		}, timeoutMs);
+
+		function handler() {
+			clearTimeout(timer);
+			resolve();
+		}
+
+		provider.on("synced", handler);
+	});
+}
+
+/**
+ * Wrap a promise with a timeout.
+ */
+export function withTimeout<T>(
+	promise: Promise<T>,
+	timeoutMs: number,
+	message?: string,
+): Promise<T> {
+	return new Promise<T>((resolve, reject) => {
+		const timer = setTimeout(
+			() =>
+				reject(
+					new Error(
+						message ?? `Operation timed out after ${timeoutMs}ms`,
+					),
+				),
+			timeoutMs,
+		);
+		promise.then(
+			(val) => {
+				clearTimeout(timer);
+				resolve(val);
+			},
+			(err) => {
+				clearTimeout(timer);
+				reject(err);
+			},
+		);
+	});
+}
+
+/**
+ * Normalize a document ID so the hub/root doc ID is treated as the tree root
+ * (null). This lets callers pass the hub doc_id from list_spaces as
+ * parentId/rootId and get the expected root-level results instead of an empty
+ * set.
+ */
+export function normalizeRootId(
+	id: string | null | undefined,
+	rootDocId: string | null,
+): string | null {
+	if (id == null) return null;
+	return id === rootDocId ? null : id;
+}
+
+/**
+ * Safely read a tree map value, converting Y.Map to plain object if needed.
+ */
+export function toPlain(val: unknown): unknown {
+	return val instanceof Y.Map ? val.toJSON() : val;
+}