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

package/src/data-fetchers/kLineDataStore.ts

@@ -0,0 +1,96 @@
+import type { KLineData } from '../controllers/types'
+import { createSignal, type Signal } from '../reactivity/signal'
+
+import type { DataWindow, DataChange } from './dataBufferTypes'
+
+export interface MergeResult {
+  readonly prependedCount: number
+  readonly advancedEarliest: boolean
+}
+
+function mergeSortedData(existing: KLineData[], incoming: KLineData[]): KLineData[] {
+  if (existing.length === 0) return [...incoming]
+  if (incoming.length === 0) return [...existing]
+
+  const tsSet = new Set<number>(existing.map((d) => d.timestamp))
+  const unique = incoming.filter((d) => !tsSet.has(d.timestamp))
+  if (unique.length === 0) return existing
+
+  const merged = [...existing, ...unique]
+  merged.sort((a, b) => a.timestamp - b.timestamp)
+  return merged
+}
+
+export class KLineDataStore {
+  private _data: KLineData[] = []
+  private _dataSignal: Signal<DataChange>
+  private _loadedWindow: DataWindow | null = null
+
+  constructor() {
+    this._dataSignal = createSignal<DataChange>({ data: [], prependedCount: 0 })
+  }
+
+  get data(): Signal<DataChange> {
+    return this._dataSignal
+  }
+
+  get loadedWindow(): DataWindow | null {
+    return this._loadedWindow
+  }
+
+  getRawData(): KLineData[] {
+    return this._data
+  }
+
+  merge(incoming: ReadonlyArray<KLineData>): MergeResult {
+    if (incoming.length === 0) return { prependedCount: 0, advancedEarliest: false }
+
+    const oldLength = this._data.length
+    const oldEarliestTs = oldLength > 0 ? this._data[0]!.timestamp : null
+    const merged = mergeSortedData(this._data, [...incoming])
+    const newEarliestTs = merged[0]?.timestamp ?? null
+    const advancedEarliest =
+      oldEarliestTs !== null && newEarliestTs !== null && newEarliestTs < oldEarliestTs
+
+    let prependedCount = 0
+    if (oldLength > 0 && merged.length > oldLength && advancedEarliest) {
+      prependedCount = merged.findIndex((d) => d.timestamp === oldEarliestTs)
+    }
+
+    this._data = merged
+    this._updateWindow()
+    this._dataSignal.set({ data: [...merged], prependedCount })
+
+    return { prependedCount, advancedEarliest }
+  }
+
+  setInlineData(data: KLineData[]): void {
+    this._data = [...data]
+    this._dataSignal.set({ data: [...data], prependedCount: 0 })
+    this._loadedWindow =
+      data.length > 0
+        ? { earliestTs: data[0]!.timestamp, latestTs: data[data.length - 1]!.timestamp }
+        : null
+  }
+
+  reset(): void {
+    this._data = []
+    this._loadedWindow = null
+    this._dataSignal.set({ data: [], prependedCount: 0 })
+  }
+
+  private _updateWindow(): void {
+    if (this._data.length > 0) {
+      const earliest = this._data[0]!.timestamp
+      const latest = this._data[this._data.length - 1]!.timestamp
+      if (!this._loadedWindow) {
+        this._loadedWindow = { earliestTs: earliest, latestTs: latest }
+      } else {
+        this._loadedWindow = {
+          earliestTs: Math.min(this._loadedWindow.earliestTs, earliest),
+          latestTs: Math.max(this._loadedWindow.latestTs, latest),
+        }
+      }
+    }
+  }
+}

package/src/data-fetchers/router.ts

@@ -1,12 +1,13 @@
 import type { DataFetcher } from '../controllers/types'
-import type { TimeShareFetcherFn } from './types'
 import { KLineChartError } from '../errors'
+
 import {
   getRegisteredFetcher,
   fetcherSupportsPeriod,
   getTimeShareFetcher,
   getRegisteredFetcherNames,
 } from './fetcherDefinitionRegistry'
+import type { TimeShareFetcherFn } from './types'
 
 export const routerDataFetcher: DataFetcher = (source, config) => {
   const def = getRegisteredFetcher(source)

package/src/data-fetchers/thousand-mock.ts

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

package/src/data-fetchers/timeKeyIndex.ts

@@ -0,0 +1,39 @@
+import type { KLineData } from '../controllers/types'
+
+export class TimeKeyIndex {
+  private _monthKeys: Int32Array | null = null
+  private _dayKeys: Int32Array | null = null
+
+  get monthKeys(): Int32Array | null {
+    return this._monthKeys
+  }
+
+  get dayKeys(): Int32Array | null {
+    return this._dayKeys
+  }
+
+  recompute(data: ReadonlyArray<KLineData>): void {
+    const n = data.length
+    if (n === 0) {
+      this._monthKeys = null
+      this._dayKeys = null
+      return
+    }
+    const monthKeys = new Int32Array(n)
+    const dayKeys = new Int32Array(n)
+    for (let i = 0; i < n; i++) {
+      const d = new Date(data[i]!.timestamp)
+      monthKeys[i] = d.getFullYear() * 12 + d.getMonth()
+      const yearStart = new Date(d.getFullYear(), 0, 0)
+      dayKeys[i] =
+        d.getFullYear() * 366 + Math.floor((d.getTime() - yearStart.getTime()) / 86400000)
+    }
+    this._monthKeys = monthKeys
+    this._dayKeys = dayKeys
+  }
+
+  reset(): void {
+    this._monthKeys = null
+    this._dayKeys = null
+  }
+}

package/src/data-fetchers/timeShareBuffer.ts

@@ -1,19 +1,22 @@
-import { createSignal, type Signal } from '../reactivity/signal'
-import type { SymbolSpec } from '../controllers/types'
-import type { TimeShareData } from '../types/price'
-import type { TimeShareFetcherFn } from './types'
-import type { DataBufferLike } from './dataBufferTypes'
-import type { DataWindow } from './dataBuffer'
-import { routerTimeShareFetcher } from './router'
 import { Effect, Fiber, pipe } from 'effect'
 import type { Effect as EffectType } from 'effect/Effect'
+
+import type { SymbolSpec } from '../controllers/types'
+import { createSignal, type Signal } from '../reactivity/signal'
+import type { TimeShareData } from '../types/price'
+
 import { fetchTimeShare, TimeShareFetchService } from './dataBuffer.effects'
+import type { DataBufferLike, DataWindow, DataChange } from './dataBufferTypes'
+import { routerTimeShareFetcher } from './router'
+import type { TimeShareFetcherFn } from './types'
+
+
 
 export class TimeShareBuffer implements DataBufferLike {
   // 当前持有的分时数据数组（内部可变副本）
   private _data: TimeShareData[] = []
   // 向外部广播只读数据快照的信号
-  private _dataSignal = createSignal<ReadonlyArray<TimeShareData>>([])
+  private _dataSignal = createSignal<DataChange>({ data: [], prependedCount: 0 })
   // 是否正在加载中，外部 UI 绑定用
   private _loadingSignal = createSignal<boolean>(false)
   // 可选的自定义 fetcher，优先级大于默认 fectcher
@@ -27,8 +30,8 @@ export class TimeShareBuffer implements DataBufferLike {
   // 实例是否已销毁，阻止后续任何操作
   private _disposed = false
 
-  get data(): Signal<ReadonlyArray<unknown>> {
-    return this._dataSignal as Signal<ReadonlyArray<unknown>>
+  get data(): Signal<DataChange> {
+    return this._dataSignal
   }
 
   get loading(): Signal<boolean> {
@@ -99,7 +102,7 @@ export class TimeShareBuffer implements DataBufferLike {
           if (this._disposed) return
           this._queryDate = 0
           this._data = [...data]
-          this._dataSignal.set([...data])
+          this._dataSignal.set({ data: [...data], prependedCount: 0 })
         }),
       ),
       Effect.ensuring(
@@ -117,7 +120,7 @@ export class TimeShareBuffer implements DataBufferLike {
   setInlineData(data: unknown[]): void {
     if (this._disposed) return
     this._data = data as TimeShareData[]
-    this._dataSignal.set([...(data as TimeShareData[])])
+    this._dataSignal.set({ data: [...(data as TimeShareData[])], prependedCount: 0 })
   }
 
   // 销毁实例

package/src/data-fetchers/tradingview.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/engine/__tests__/chart.dpr.test.ts

@@ -1,8 +1,10 @@
 // @vitest-environment jsdom
 import { afterEach, beforeEach, beforeAll, describe, expect, it, vi } from 'vitest'
-import { Chart, type ChartDom, type ChartOptions } from '@/core/chart'
+
 import { loadBuiltinIndicators } from '../indicators/registerBuiltins'
 
+import { Chart, type ChartDom, type ChartOptions } from '@/core/chart'
+
 class ResizeObserverMock {
   static instances: ResizeObserverMock[] = []
   static failWithDevicePixelBox = false

package/src/engine/__tests__/paneRenderer.resize.test.ts

@@ -1,5 +1,6 @@
 // @vitest-environment jsdom
 import { describe, expect, it } from 'vitest'
+
 import { Pane } from '@/core/layout/pane'
 import { PaneRenderer } from '@/core/paneRenderer'
 import { SharedWebGLSurface } from '@/core/renderers/webgl/sharedWebGLSurface'

package/src/engine/__tests__/subPaneManager.test.ts

@@ -1,7 +1,8 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { SubPaneManager, type SubPaneContext } from '../subPaneManager'
-import type { SubIndicatorType } from '../renderers/Indicator'
+
 import type { IndicatorScheduler } from '../indicators/scheduler'
+import type { SubIndicatorType } from '../renderers/Indicator'
+import { SubPaneManager, type SubPaneContext } from '../subPaneManager'
 
 function createMockScheduler(): Partial<IndicatorScheduler> {
   return {

package/src/engine/chart.ts

@@ -1,13 +1,8 @@
-import type { KLineData } from '../types/price'
 import type { ChartSettings } from '../config/chartSettings'
-import { createSignal, type Signal, type Computed } from '../reactivity/signal'
 import type { SymbolSpec, SymbolInfo, CustomDataSource } from '../controllers/types'
-import { ChartDataManager } from './data/chartDataManager'
-import { ChartPaneLayout } from './layout/chartPaneLayout'
-import { UpdateLevel, type VisibleRange } from './layout/pane'
-import type { ScaleType } from './utils/tickPosition'
-import { InteractionController, type InteractionSnapshot } from './controller/interaction'
-export type { InteractionSnapshot }
+import { createSignal, type Signal, type Computed } from '../reactivity/signal'
+import type { KLineData } from '../types/price'
+
 import type {
   ChartDom,
   PaneSpec,
@@ -18,14 +13,22 @@ import type {
   SubPaneInfo,
   DrawingToolType,
 } from './chartTypes'
+import { InteractionController, type InteractionSnapshot } from './controller/interaction'
+import { ChartDataManager } from './data/chartDataManager'
+import { ChartIndicatorManager } from './indicators/chartIndicatorManager'
+import { resolveStateKey } from './indicators/indicatorMetadata'
+import type { IndicatorMetadata } from './indicators/indicatorMetadata'
+import type { IndicatorScheduler } from './indicators/scheduler'
+import { ChartPaneLayout } from './layout/chartPaneLayout'
+import { UpdateLevel, type VisibleRange } from './layout/pane'
+import type { ScaleType } from './utils/tickPosition'
+export type { InteractionSnapshot }
 import { PaneRenderer } from './paneRenderer'
 import { SharedWebGLSurface } from './renderers/webgl/sharedWebGLSurface'
 import type { MarkerManager, CustomMarkerEntity } from './marker/registry'
 import { getPhysicalKLineConfig } from './utils/klineConfig'
 import { ChartZoomController } from './utils/chartZoomController'
 import { ChartViewportManager } from './viewport/chartViewportManager'
-import { ChartIndicatorManager } from './indicators/chartIndicatorManager'
-import type { IndicatorScheduler } from './indicators/scheduler'
 import type { SubPaneEntry } from './subPaneManager'
 import { ChartRenderer } from './render/chartRenderer'
 import { KLineMode } from './modes/kLineMode'
@@ -40,7 +43,9 @@ import {
   type RendererPluginWithHost,
   wrapPaneInfo,
 } from '../plugin'
+
 import type { SubIndicatorType } from './renderers/Indicator'
+
 import type { AlertController, MarketSnapshot } from '../alerts/types'
 import { createAlertController } from '../alerts'
 import {
@@ -48,8 +53,6 @@ import {
   pushToVolumeLookbacks,
   type VolumeLookbacks,
 } from '../alerts/rollingVolume'
-import { resolveStateKey } from './indicators/indicatorMetadata'
-import type { IndicatorMetadata } from './indicators/indicatorMetadata'
 import type { Layer } from '../scene/types'
 
 // 重新导出以保持向后兼容
@@ -1089,7 +1092,7 @@ export class Chart {
   }
 
   get dataBuffer(): import('../data-fetchers/dataBuffer').DataBuffer {
-    return this.dataManager.dataBuffer
+    return this.dataManager.dataBuffer as import('../data-fetchers/dataBuffer').DataBuffer
   }
 
   checkVisibleRangeGap(): void {
@@ -1137,6 +1140,14 @@ export class Chart {
     this.dataManager.applyCustomData(source)
   }
 
+  resetToFetcher(spec: SymbolSpec): void {
+    this.dataManager.resetToFetcher(spec)
+  }
+
+  getPreCustomSpec(): SymbolSpec | null {
+    return this.dataManager.getPreCustomSpec()
+  }
+
   // ---------- Theme ----------
 
   /**

package/src/engine/controller/__tests__/interaction.dpr.test.ts

@@ -1,5 +1,6 @@
 // @vitest-environment jsdom
 import { describe, expect, it, vi } from 'vitest'
+
 import { InteractionController } from '@/core/controller/interaction'
 import type { KLineData } from '@/types/price'
 

package/src/engine/controller/interaction.ts

@@ -1,13 +1,15 @@
 // 交互控制中心
 
-import type { Chart } from '../chart'
+import type { ChartSettings } from '../../config/chartSettings'
 import type { KLineData } from '../../types/price'
+import type { Chart } from '../chart'
+import { UpdateLevel } from '../layout/pane'
 import type { MarkerEntity, CustomMarkerEntity } from '../marker/registry'
+
 import { MarkerInteractionState } from './markerInteraction'
 import { PinchTracker } from './pinchTracker'
 import { computeTooltipPosition } from './tooltipPosition'
-import { UpdateLevel } from '../layout/pane'
-import type { ChartSettings } from '../../config/chartSettings'
+
 
 interface PointerLocation {
   mouseX: number

package/src/engine/controller/pinchTracker.ts

@@ -24,7 +24,7 @@ export class PinchTracker {
 
     if (this.activePointers.size === 2 && isTouchSession) {
       this.isPinching = true
-      const pointers = Array.from(this.activePointers.values())
+      const pointers = [...this.activePointers.values()]
       const p1 = pointers[0]!
       const p2 = pointers[1]!
       this.lastPinchDistance = Math.hypot(p2.x - p1.x, p2.y - p1.y)
@@ -57,7 +57,7 @@ export class PinchTracker {
     }
 
     if (this.isPinching && this.activePointers.size === 2) {
-      const pointers = Array.from(this.activePointers.values())
+      const pointers = [...this.activePointers.values()]
       const p1 = pointers[0]!
       const p2 = pointers[1]!
       const distance = Math.hypot(p2.x - p1.x, p2.y - p1.y)