@363045841yyt/klinechart-core 0.8.13 → 0.8.14-alpha.2

package/src/config/chartSettings.ts

@@ -16,7 +16,7 @@ export interface SettingItem {
  * 优先使用 Client Hints API (navigator.userAgentData)，不支持时回退到 UA + 屏幕/触控检测
  */
 export function getDeviceType(): 'mobile' | 'tablet' | 'desktop' {
-  if (typeof navigator === 'undefined') return 'desktop'
+  if (typeof navigator === 'undefined' || typeof window === 'undefined') return 'desktop'
 
   const uaData = (navigator as any).userAgentData
   if (uaData?.formFactor) {
@@ -123,13 +123,43 @@ export const DEFAULT_SETTINGS = [
   },
 ] as const
 
+type _SettingTuple = typeof DEFAULT_SETTINGS
+
+type _SettingByKey = {
+  [Item in _SettingTuple[number] as Item['key']]:
+    Item['type'] extends 'boolean' ? boolean :
+    Item extends { type: 'select'; options: ReadonlyArray<{ value: infer V }> } ? V :
+    string
+}
+
 /** 图表设置类型（从 DEFAULT_SETTINGS 自动推导，同时兼容扩展） */
 export type ChartSettings = {
-  [K in (typeof DEFAULT_SETTINGS)[number]['key']]?: boolean | string
-} & Record<string, boolean | string | ColorPresetSettings | undefined> & {
-    colorPresetSettings?: ColorPresetSettings
-  }
+  [K in keyof _SettingByKey]?: _SettingByKey[K]
+} & Record<string, unknown> & {
+  colorPresetSettings?: ColorPresetSettings
+}
+
+/** 将 Partial 可选偏好设置与 DEFAULT_SETTINGS 默认值合并，返回全量 ChartSettings
+ *
+ * @param partial - 偏好的部分设置（通常是组件 prop 传入）
+ * @returns 合并后的 ChartSettings 对象
+ */
+export function resolveSettings(partial?: Partial<ChartSettings>): ChartSettings {
+  // 用 Partial<_SettingByKey> 而非 ChartSettings 避免交叉类型索引赋值报错
+  const result: Partial<_SettingByKey> = {}
+  DEFAULT_SETTINGS.forEach((item) => {
+    // 未在 partial 中指定的 key 回退到 DEFAULT_SETTINGS 的默认值
+    // 用 ?? 而非 ||，确保显式传入 false / '' 不会被默认值覆盖
+    ;(result as Record<string, unknown>)[item.key] = partial?.[item.key] ?? item.default
+  })
+  // colorPresetSettings 不在 DEFAULT_SETTINGS 中，需单独归一化
+  ;(result as ChartSettings).colorPresetSettings = normalizeColorPresetSettings(partial?.colorPresetSettings)
+  return result as ChartSettings
+}
 
 /** localStorage 存储键名 */
 export const SETTINGS_STORAGE_KEY = 'kline-chart-settings'
-import type { ColorPresetSettings } from '../tokens/colorPresetSettings'
+import {
+  type ColorPresetSettings,
+  normalizeColorPresetSettings,
+} from '../tokens/colorPresetSettings'

package/src/controllers/__tests__/drawing.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect, vi } from 'vitest'
+
 import { createDrawingController } from '../createDrawingController'
 
 // ---------------------------------------------------------------------------

package/src/controllers/__tests__/indicatorSelector.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
+
 import { createIndicatorSelectorController } from '../createIndicatorSelectorController'
 import type { IndicatorDefinition } from '../types'
 

package/src/controllers/__tests__/toolbar.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect, vi } from 'vitest'
+
 import { createToolbarController } from '../createToolbarController'
 import type { ToolDefinition } from '../types'
 

package/src/controllers/createChartController.ts

@@ -12,8 +12,23 @@
  *   - Tear down DOM + listeners on dispose().
  */
 
+import { resolveSettings } from '../config/chartSettings'
+import { Chart, type InteractionSnapshot as LegacyInteractionSnapshot } from '../engine/chart'
+import type {
+  ChartOptions,
+  ViewportState as LegacyViewportState,
+  IndicatorInstance as LegacyIndicatorInstance,
+  SubPaneInfo as LegacySubPaneInfo,
+  DrawingObject as LegacyDrawingObject,
+  DrawingToolType as LegacyDrawingToolType,
+} from '../engine/chartTypes'
+import { loadBuiltinIndicators } from '../engine/indicators/registerBuiltins'
+import type { CustomMarkerEntity } from '../engine/marker/registry'
+import { zoomLevelToKWidth, kGapFromKWidth } from '../engine/utils/zoom'
 import { KLineChartError } from '../errors'
+import { ChartBridge } from '../mcp/chartBridge'
 import { createSignal, type Signal } from '../reactivity'
+
 import type {
   ChartController,
   ChartMountOptions,
@@ -33,19 +48,6 @@ import type {
   DataFetcher,
   CustomDataSource,
 } from './types'
-import type { CustomMarkerEntity } from '../engine/marker/registry'
-import { Chart, type InteractionSnapshot as LegacyInteractionSnapshot } from '../engine/chart'
-import type {
-  ChartOptions,
-  ViewportState as LegacyViewportState,
-  IndicatorInstance as LegacyIndicatorInstance,
-  SubPaneInfo as LegacySubPaneInfo,
-  DrawingObject as LegacyDrawingObject,
-  DrawingToolType as LegacyDrawingToolType,
-} from '../engine/chartTypes'
-import { zoomLevelToKWidth, kGapFromKWidth } from '../engine/utils/zoom'
-import { loadBuiltinIndicators } from '../engine/indicators/registerBuiltins'
-import { ChartBridge } from '../mcp/chartBridge'
 
 // Plugin-backed drawings expose `kind` instead of legacy `type`.
 type PluginBackedDrawingObject = {
@@ -463,6 +465,15 @@ export async function createChartController(opts: ChartMountOptions): Promise<Ch
     }
   }
 
+  // Apply initial settings (partial, merged with defaults)
+  if (opts.settings) {
+    try {
+      chart.updateSettingsFacade(resolveSettings(opts.settings))
+    } catch {
+      /* tolerate first-paint racing */
+    }
+  }
+
   // -------------------------------------------------------------------
   // Signal bridges — subscribe to Chart's facade signals and forward
   // -------------------------------------------------------------------
@@ -599,6 +610,16 @@ export async function createChartController(opts: ChartMountOptions): Promise<Ch
     chart.applyCustomData(source)
   }
 
+  function resetToFetcher(spec: SymbolSpec): void {
+    if (disposed) return
+    chart.resetToFetcher(spec)
+  }
+
+  function getPreCustomSpec(): SymbolSpec | null {
+    if (disposed) return null
+    return chart.getPreCustomSpec()
+  }
+
   function setDataFetcher(fetcher: DataFetcher | null): void {
     if (disposed) return
     chart.setDataFetcher(fetcher)
@@ -957,6 +978,8 @@ export async function createChartController(opts: ChartMountOptions): Promise<Ch
     setCurrentPeriod,
     switchToTimeShareForDate,
     applyCustomData,
+    resetToFetcher,
+    getPreCustomSpec,
     setDataFetcher,
     ensureDataRange,
     setData,

package/src/controllers/createDrawingController.ts

@@ -18,6 +18,7 @@
  */
 
 import { createSignal, type Signal } from '../reactivity'
+
 import type { DrawingController, DrawingState, DrawingToolType } from './types'
 
 // ---------------------------------------------------------------------------

package/src/controllers/createIndicatorSelectorController.ts

@@ -12,6 +12,7 @@
  */
 
 import { createSignal, computed, type Signal } from '../reactivity'
+
 import type { ActiveIndicator, IndicatorDefinition, IndicatorSelectorController } from './types'
 
 // ---------------------------------------------------------------------------
@@ -209,7 +210,7 @@ export function createIndicatorSelectorController(
     // Main indicators are pinned to the front and cannot be reordered.
     if (fromItem.role !== 'sub' || toItem.role !== 'sub') return false
 
-    const next = current.slice()
+    const next = [...current]
     next.splice(fromIdx, 1)
     next.splice(toIdx, 0, fromItem)
     active.set(next)

package/src/controllers/createToolbarController.ts

@@ -21,6 +21,7 @@
  */
 
 import { createSignal, type Signal } from '../reactivity'
+
 import type { ToolbarController, ToolDefinition, ToolId } from './types'
 
 // ---------------------------------------------------------------------------

package/src/controllers/types.ts

@@ -8,11 +8,12 @@
  * Mutation methods are imperative — adapters call them in event handlers.
  */
 
-import type { Signal } from '../reactivity'
-import type { CustomMarkerEntity } from '../engine/marker/registry'
-import type { PaneSpec } from '../engine/chartTypes'
-import type { InteractionSnapshot } from '../engine/chart'
 import type { AlertController } from '../alerts/types'
+import type { ChartSettings } from '../config/chartSettings'
+import type { InteractionSnapshot } from '../engine/chart'
+import type { PaneSpec } from '../engine/chartTypes'
+import type { CustomMarkerEntity } from '../engine/marker/registry'
+import type { Signal } from '../reactivity'
 
 // Controller-owned public surface. Legacy engine types may mirror these
 // shapes internally, but adapters depend only on core-defined contracts.
@@ -259,6 +260,9 @@ export interface ChartMountOptions {
   minKWidth?: number
   maxKWidth?: number
 
+  // Initial chart settings (partial, merged with DEFAULT_SETTINGS)
+  settings?: Partial<ChartSettings>
+
   // MCP / AI runtime bridge
   mcp?: {
     wsUrl?: string
@@ -266,8 +270,7 @@ export interface ChartMountOptions {
       name: string
       input: Record<string, unknown>
     }) =>
-      | { success: boolean; error?: string; data?: unknown }
-      | Promise<{ success: boolean; error?: string; data?: unknown }>
+      Promise<{ success: boolean; error?: string; data?: unknown }> | { success: boolean; error?: string; data?: unknown }
     autoReconnect?: boolean
   }
 }
@@ -314,6 +317,8 @@ export interface ChartController extends DrawingChartAdapter {
   switchToTimeShareForDate(dateYYYYMMDD: number): void
   /** Inject a complete custom data bundle (bypasses fetcher pipeline) */
   applyCustomData(source: CustomDataSource): void
+  resetToFetcher(spec: SymbolSpec): void
+  getPreCustomSpec(): SymbolSpec | null
   setDataFetcher(fetcher: DataFetcher | null): void
   setData(next: ReadonlyArray<KLineData>): void
   appendData(next: ReadonlyArray<KLineData>): void

package/src/data-fetchers/__tests__/binance.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
+
 import { BinanceSSESource, DEFAULT_BINANCE_SSE_URL } from '../binance'
 import type { DepthDelta, DepthSnapshot, DepthSourceStatus } from '../depthTypes'
 

package/src/data-fetchers/__tests__/dataBuffer.test.ts

@@ -1,6 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { DataBuffer } from '../dataBuffer'
+
 import type { DataFetcher, KLineData, SymbolSpec } from '../../controllers/types'
+import { DataBuffer } from '../dataBuffer'
 
 function makeKLine(ts: number): KLineData {
   return {
@@ -37,7 +38,7 @@ describe('DataBuffer', () => {
   })
 
   it('initial state: empty data, not loading', () => {
-    expect(buffer.data()).toEqual([])
+    expect(buffer.data().data).toEqual([])
     expect(buffer.loading()).toBe(false)
     expect(buffer.loadedWindow).toBeNull()
   })
@@ -62,7 +63,7 @@ describe('DataBuffer', () => {
       expect(buffer.loading()).toBe(false)
     })
 
-    expect(buffer.data()).toHaveLength(2)
+    expect(buffer.data().data).toHaveLength(2)
     expect(buffer.loadedWindow).not.toBeNull()
     expect(buffer.loadedWindow!.earliestTs).toBe(fetchedData[0]!.timestamp)
     expect(buffer.loadedWindow!.latestTs).toBe(fetchedData[1]!.timestamp)
@@ -106,7 +107,7 @@ describe('DataBuffer', () => {
     })
 
     expect(fetchCount).toBe(2)
-    expect(buffer.data()).toHaveLength(4)
+    expect(buffer.data().data).toHaveLength(4)
     expect(buffer.loadedWindow!.earliestTs).toBe(oneYearAgo - 90 * MS_PER_DAY)
   })
 
@@ -237,7 +238,7 @@ describe('DataBuffer', () => {
     buffer.setFetcher(fetcher)
     buffer.dispose()
 
-    expect(buffer.data()).toEqual([])
+    expect(buffer.data().data).toEqual([])
   })
 
   it('setSymbol resets data before loading', async () => {
@@ -251,21 +252,21 @@ describe('DataBuffer', () => {
       expect(buffer.loading()).toBe(false)
     })
 
-    expect(buffer.data()).toHaveLength(1)
+    expect(buffer.data().data).toHaveLength(1)
 
     buffer.setSymbol({ ...defaultSpec, symbol: 'sz.000001' })
 
-    expect(buffer.data()).toEqual([])
+    expect(buffer.data().data).toEqual([])
     expect(buffer.loadedWindow).toBeNull()
 
     await vi.waitFor(() => {
       expect(buffer.loading()).toBe(false)
     })
 
-    expect(buffer.data()).toHaveLength(1)
+    expect(buffer.data().data).toHaveLength(1)
   })
 
-  it('onPrepend is called when data is prepended (earlier timestamps)', async () => {
+  it('data change includes prependedCount when data is prepended (earlier timestamps)', async () => {
     const now = Date.now()
     const oneYearAgo = now - 365 * MS_PER_DAY
     const initialData = [makeKLine(oneYearAgo), makeKLine(now)]
@@ -285,7 +286,9 @@ describe('DataBuffer', () => {
     })
 
     const prependCalls: number[] = []
-    buffer.onPrepend = (count) => prependCalls.push(count)
+    const unsub = buffer.data.subscribe(() => {
+      prependCalls.push(buffer.data.peek().prependedCount)
+    })
 
     buffer.ensureRange(oneYearAgo - 30 * MS_PER_DAY, oneYearAgo)
 
@@ -293,17 +296,19 @@ describe('DataBuffer', () => {
       expect(buffer.loading()).toBe(false)
     })
 
-    expect(prependCalls).toHaveLength(1)
-    expect(prependCalls[0]).toBe(2)
+    unsub()
+    expect(prependCalls).toContain(2)
   })
 
-  it('onPrepend is not called for initial load', async () => {
+  it('prependedCount is 0 for initial load', async () => {
     const now = Date.now()
     const oneYearAgo = now - 365 * MS_PER_DAY
     const fetcher: DataFetcher = async () => [makeKLine(oneYearAgo), makeKLine(now)]
 
     const prependCalls: number[] = []
-    buffer.onPrepend = (count) => prependCalls.push(count)
+    const unsub = buffer.data.subscribe(() => {
+      prependCalls.push(buffer.data.peek().prependedCount)
+    })
 
     buffer.setFetcher(fetcher)
     buffer.setSymbol(defaultSpec)
@@ -312,7 +317,8 @@ describe('DataBuffer', () => {
       expect(buffer.loading()).toBe(false)
     })
 
-    expect(prependCalls).toHaveLength(0)
+    unsub()
+    expect(prependCalls.filter((c) => c > 0)).toHaveLength(0)
   })
 
   it('ensureRange allows retry when previous fetch did not advance earliestTs', async () => {

package/src/data-fetchers/__tests__/depthConnector.test.ts

@@ -1,7 +1,8 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
+
+import type { HeatmapController, HeatmapControllerConfig } from '../../components/orderBookHeatmap'
 import { DepthConnector } from '../depthConnector'
 import type { DepthDelta, DepthSnapshot, DepthSource, DepthSourceStatus } from '../depthTypes'
-import type { HeatmapController, HeatmapControllerConfig } from '../../components/orderBookHeatmap'
 
 // ---------------------------------------------------------------------------
 // Fake DepthSource — controllable callbacks

package/src/data-fetchers/__tests__/fetcherRegistry.test.ts

@@ -1,4 +1,6 @@
 import { describe, expect, it, vi, beforeEach } from 'vitest'
+
+import type { KLineData } from '../../controllers/types'
 import {
   DataFetcher,
   getRegisteredFetcher,
@@ -8,7 +10,6 @@ import {
 } from '../fetcherDefinitionRegistry'
 import { routerDataFetcher } from '../router'
 import type { DataFetcherFn } from '../types'
-import type { KLineData } from '../../controllers/types'
 
 const mockFetch = vi.fn<() => Promise<ReadonlyArray<KLineData>>>()
 

package/src/data-fetchers/baostock.ts

@@ -1,5 +1,6 @@
-import { KLineChartError } from '../errors'
 import type { KLineData } from '../controllers/types'
+import { KLineChartError } from '../errors'
+
 import { DataFetcher } from './fetcherDefinitionRegistry'
 import type { FetchConfig } from './types'
 

package/src/data-fetchers/binance.ts

@@ -1,4 +1,5 @@
 import { KLineChartError } from '../errors'
+
 import type { DepthDelta, DepthSnapshot, DepthSource, DepthSourceStatus } from './depthTypes'
 
 export const DEFAULT_BINANCE_SSE_URL = 'http://localhost:8081/api/biance/depth-events'

package/src/data-fetchers/dataBuffer.effects.ts

@@ -1,7 +1,8 @@
 import { Context, Effect, pipe, Schedule } from 'effect'
 import type { Effect as EffectType } from 'effect/Effect'
-import { KLineChartError } from '../errors'
+
 import type { KLineData, SymbolSpec } from '../controllers/types'
+import { KLineChartError } from '../errors'
 import type { TimeShareData } from '../types/price'
 
 // ── KLine fetch service tag ──