@363045841yyt/klinechart-core 0.8.8 → 0.8.9

package/src/controllers/createChartController.ts

@@ -25,7 +25,7 @@ import type {
     DrawingControllerCallbacks,
     IndicatorDefinition,
     KLineData,
-    PaneInfo,
+    PaneLayoutInfo,
     PaneSpec,
     SymbolSpec,
     DataFetcher,
@@ -773,7 +773,7 @@ export async function createChartController(opts: ChartMountOptions): Promise<Ch
         return renderer?.getPane().yAxis.yToPrice(y) ?? 0
     }
 
-    function getPaneInfo(paneId: string): PaneInfo | undefined {
+    function getPaneInfo(paneId: string): PaneLayoutInfo | undefined {
         if (disposed) return undefined
         const renderer = chart.getPaneRenderers().find(item => item.getPane().id === paneId)
         const pane = renderer?.getPane()

package/src/controllers/index.ts

@@ -25,7 +25,7 @@ export type {
     PaneSpec,
     DrawingChartAdapter,
     DrawingChartViewport,
-    PaneInfo,
+    PaneLayoutInfo,
     SymbolSpec,
     DataFetcher,
 } from './types'

package/src/controllers/types.ts

@@ -156,7 +156,7 @@ export type { InteractionSnapshot }
 // Pane info (read-only pane metadata for DrawingChartAdapter)
 // ---------------------------------------------------------------------------
 
-export interface PaneInfo {
+export interface PaneLayoutInfo {
     paneId: string
     top: number
     height: number
@@ -196,7 +196,7 @@ export interface DrawingChartAdapter {
     /** Y within the given pane → price */
     yToPrice(paneId: string, y: number): number
     /** read-only pane metadata by pane ID */
-    getPaneInfo(paneId: string): PaneInfo | undefined
+    getPaneInfo(paneId: string): PaneLayoutInfo | undefined
 }
 
 // ---------------------------------------------------------------------------

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

@@ -398,4 +398,139 @@ describe('DataBuffer', () => {
 
         expect(fetchCount).toBe(3)
     })
+
+    // ── Int32Array precomputation tests ──
+
+    function expectedMonthKey(ts: number): number {
+        const d = new Date(ts)
+        return d.getFullYear() * 12 + d.getMonth()
+    }
+
+    function expectedDayKey(ts: number): number {
+        const d = new Date(ts)
+        const yearStart = new Date(d.getFullYear(), 0, 0)
+        return d.getFullYear() * 366 + Math.floor((d.getTime() - yearStart.getTime()) / 86400000)
+    }
+
+    it('setInlineData precomputes monthKeys and dayKeys', () => {
+        const data = [
+            makeKLine(1735689600000), // 2025-01-01
+            makeKLine(1738368000000), // 2025-02-01
+            makeKLine(1740787200000), // 2025-03-01
+        ]
+        buffer.setInlineData(data)
+
+        const monthKeys = buffer.getMonthKeys()
+        const dayKeys = buffer.getDayKeys()
+        expect(monthKeys).not.toBeNull()
+        expect(dayKeys).not.toBeNull()
+        expect(monthKeys!.length).toBe(3)
+        expect(dayKeys!.length).toBe(3)
+
+        for (let i = 0; i < data.length; i++) {
+            expect(monthKeys![i]).toBe(expectedMonthKey(data[i]!.timestamp))
+            expect(dayKeys![i]).toBe(expectedDayKey(data[i]!.timestamp))
+        }
+    })
+
+    it('setInlineData with empty data sets keys to null', () => {
+        buffer.setInlineData([])
+        expect(buffer.getMonthKeys()).toBeNull()
+        expect(buffer.getDayKeys()).toBeNull()
+    })
+
+    it('setInlineData replaces previous keys', () => {
+        const data1 = [makeKLine(1735689600000)]
+        buffer.setInlineData(data1)
+        expect(buffer.getMonthKeys()!.length).toBe(1)
+
+        const data2 = [
+            makeKLine(1735689600000),
+            makeKLine(1738368000000),
+        ]
+        buffer.setInlineData(data2)
+        expect(buffer.getMonthKeys()!.length).toBe(2)
+        expect(buffer.getDayKeys()!.length).toBe(2)
+    })
+
+    it('dispose clears keys to null', () => {
+        buffer.setInlineData([makeKLine(1735689600000)])
+        expect(buffer.getMonthKeys()).not.toBeNull()
+
+        buffer.dispose()
+        expect(buffer.getMonthKeys()).toBeNull()
+        expect(buffer.getDayKeys()).toBeNull()
+    })
+
+    it('setSymbol resets keys to null before load', () => {
+        buffer.setInlineData([makeKLine(1735689600000)])
+        expect(buffer.getMonthKeys()).not.toBeNull()
+
+        buffer.setSymbol({ ...defaultSpec, symbol: 'sz.000002' })
+        expect(buffer.getMonthKeys()).toBeNull()
+        expect(buffer.getDayKeys()).toBeNull()
+    })
+
+    it('keys are available after async fetch completes', async () => {
+        const now = Date.now()
+        const oneYearAgo = now - 365 * MS_PER_DAY
+        const initialData = [makeKLine(oneYearAgo), makeKLine(now)]
+
+        const fetcher: DataFetcher = async () => initialData
+        buffer.setFetcher(fetcher)
+        buffer.setSymbol(defaultSpec)
+
+        await vi.waitFor(() => {
+            expect(buffer.loading()).toBe(false)
+        })
+
+        const monthKeys = buffer.getMonthKeys()
+        const dayKeys = buffer.getDayKeys()
+        expect(monthKeys).not.toBeNull()
+        expect(dayKeys).not.toBeNull()
+        expect(monthKeys!.length).toBe(2)
+        expect(dayKeys!.length).toBe(2)
+
+        for (let i = 0; i < initialData.length; i++) {
+            expect(monthKeys![i]).toBe(expectedMonthKey(initialData[i]!.timestamp))
+            expect(dayKeys![i]).toBe(expectedDayKey(initialData[i]!.timestamp))
+        }
+    })
+
+    it('keys are recomputed after incremental fetch prepends data', async () => {
+        const now = Date.now()
+        const oneYearAgo = now - 365 * MS_PER_DAY
+        const initialData = [makeKLine(oneYearAgo), makeKLine(now)]
+        const prependData = [makeKLine(oneYearAgo - 90 * MS_PER_DAY)]
+        const allData = [...prependData, ...initialData]
+
+        let fetchCount = 0
+        const fetcher: DataFetcher = async () => {
+            fetchCount++
+            if (fetchCount === 1) return initialData
+            return prependData
+        }
+
+        buffer.setFetcher(fetcher)
+        buffer.setSymbol(defaultSpec)
+
+        await vi.waitFor(() => {
+            expect(buffer.loading()).toBe(false)
+        })
+
+        expect(fetchCount).toBe(1)
+        expect(buffer.getMonthKeys()!.length).toBe(2)
+
+        buffer.ensureRange(oneYearAgo - 30 * MS_PER_DAY, oneYearAgo)
+
+        await vi.waitFor(() => {
+            expect(buffer.loading()).toBe(false)
+        })
+
+        expect(buffer.getMonthKeys()!.length).toBe(3)
+        for (let i = 0; i < allData.length; i++) {
+            expect(buffer.getMonthKeys()![i]).toBe(expectedMonthKey(allData[i]!.timestamp))
+            expect(buffer.getDayKeys()![i]).toBe(expectedDayKey(allData[i]!.timestamp))
+        }
+    })
 })

package/src/data-fetchers/dataBuffer.ts

@@ -8,10 +8,26 @@ export interface DataWindow {
 }
 
 const MS_PER_DAY = 86_400_000
-const INITIAL_LOAD_DAYS = 365
-const INCREMENTAL_LOAD_DAYS = 90
 const FETCH_MAX_RETRIES = 2
 
+const PERIOD_INITIAL_DAYS: Record<string, number> = {
+  '1min': 3,
+  '5min': 30,
+  '15min': 60,
+  '30min': 90,
+  '60min': 180,
+  daily: 365,
+  weekly: 365,
+  monthly: 365,
+  quarterly: 365,
+  yearly: 365,
+  timeshare: 1,
+}
+
+export function getPeriodDays(period?: string): number {
+  return PERIOD_INITIAL_DAYS[period ?? 'daily'] ?? 365
+}
+
 function formatDate(ts: number): string {
     const d = new Date(ts)
     const y = d.getFullYear()
@@ -47,6 +63,8 @@ export class DataBuffer implements DataBufferLike {
     private _pendingFetch: Promise<void> | null = null
     private _disposed = false
     private _attemptedBoundaries: Set<number> = new Set()
+    private _monthKeys: Int32Array | null = null
+    private _dayKeys: Int32Array | null = null
 
     onPrepend: ((count: number) => void) | null = null
 
@@ -75,6 +93,33 @@ export class DataBuffer implements DataBufferLike {
         return this._data
     }
 
+    getMonthKeys(): Int32Array | null {
+        return this._monthKeys
+    }
+
+    getDayKeys(): Int32Array | null {
+        return this._dayKeys
+    }
+
+    private _precomputeKeys(): void {
+        const n = this._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(this._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
+    }
+
     setFetcher(fetcher: DataFetcher | null): void {
         this._fetcher = fetcher
     }
@@ -88,6 +133,8 @@ export class DataBuffer implements DataBufferLike {
         this._data = []
         this._loadedWindow = null
         this._attemptedBoundaries.clear()
+        this._monthKeys = null
+        this._dayKeys = null
         this._dataSignal.set([])
         if (initialStartTs !== undefined) {
             this.loadInitialRange(initialStartTs, Date.now())
@@ -110,15 +157,16 @@ export class DataBuffer implements DataBufferLike {
         this.fetchRange(requestStartTs, incrementalEnd)
     }
 
-    private loadInitial(): void {
-        if ((!this._requestFetch && !this._fetcher) || !this._currentSpec || this._disposed) return
+	private loadInitial(): void {
+		if ((!this._requestFetch && !this._fetcher) || !this._currentSpec || this._disposed) return
 
-        const now = Date.now()
-        const startDate = now - INITIAL_LOAD_DAYS * MS_PER_DAY
-        const endDate = now
+		const now = Date.now()
+		const days = getPeriodDays(this._currentSpec.period)
+		const startDate = now - days * MS_PER_DAY
+		const endDate = now
 
-        this.fetchRange(startDate, endDate)
-    }
+		this.fetchRange(startDate, endDate)
+	}
 
     private loadInitialRange(startTs: number, endTs: number): void {
         if ((!this._requestFetch && !this._fetcher) || !this._currentSpec || this._disposed) return
@@ -182,6 +230,7 @@ export class DataBuffer implements DataBufferLike {
 
                 this._data = merged
                 this._dataSignal.set([...merged])
+                this._precomputeKeys()
 
                 if (merged.length > 0) {
                     const newEarliest = merged[0]!.timestamp
@@ -245,6 +294,7 @@ export class DataBuffer implements DataBufferLike {
             this._loadedWindow = null
         }
         this._attemptedBoundaries.clear()
+        this._precomputeKeys()
     }
 
     /**
@@ -260,5 +310,7 @@ export class DataBuffer implements DataBufferLike {
         this._data = []
         this._loadedWindow = null
         this._attemptedBoundaries.clear()
+        this._monthKeys = null
+        this._dayKeys = null
     }
 }

package/src/engine/chart.ts

@@ -611,49 +611,6 @@ export class Chart {
         return this.indicatorManager.getSubPaneEntry(paneId)
     }
 
-    private getDefaultSubPaneParams(indicatorId: SubIndicatorType): Record<string, unknown> {
-        // 默认参数定义在 SubPaneManager 中，这里导入使用
-        const defaults: Record<string, Record<string, unknown>> = {
-            VOLUME: {},
-            MACD: { fastPeriod: 12, slowPeriod: 26, signalPeriod: 9 },
-            RSI: { period1: 6, period2: 12, period3: 24 },
-            CCI: { period: 14, showCCI: true },
-            STOCH: { n: 9, m: 3, showK: true, showD: true },
-            MOM: { period: 10, showMOM: true },
-            WMSR: { period: 14, showWMSR: true },
-            KST: { roc1: 10, roc2: 15, roc3: 20, roc4: 30, signalPeriod: 9, showKST: true, showSignal: true },
-            FASTK: { period: 9, showFASTK: true },
-            ATR: { period: 14, showATR: true },
-            WMA: { period: 10, showWMA: true },
-            DEMA: { period: 14, showDEMA: true },
-            TEMA: { period: 14, showTEMA: true },
-            HMA: { period: 14, showHMA: true },
-            KAMA: { period: 10, fastPeriod: 2, slowPeriod: 30, showKAMA: true },
-            SAR: { step: 0.02, maxStep: 0.2, showSAR: true },
-            SUPERTREND: { atrPeriod: 10, multiplier: 3, showSuperTrend: true },
-            KELTNER: { emaPeriod: 20, atrPeriod: 10, multiplier: 2, showUpper: true, showMiddle: true, showLower: true },
-            DONCHIAN: { period: 20, showUpper: true, showMiddle: true, showLower: true },
-            ICHIMOKU: { tenkanPeriod: 9, kijunPeriod: 26, spanBPeriod: 52, displacement: 26, showTenkan: true, showKijun: true, showSpanA: true, showSpanB: true, showChikou: true, showCloud: true },
-            ROC: { period: 12, showROC: true },
-            TRIX: { period: 15, signalPeriod: 9, showTRIX: true, showSignal: true },
-            HV: { period: 20, annualizationFactor: 252, showHV: true },
-            PARKINSON: { period: 20, annualizationFactor: 252, showParkinson: true },
-            CHAIKIN_VOL: { emaPeriod: 10, rocPeriod: 10, showChaikinVol: true },
-            VMA: { period: 5, showVMA: true },
-            OBV: { showOBV: true },
-            PVT: { showPVT: true },
-            VWAP: { sessionResetGapMs: 0, showVWAP: true },
-            CMF: { period: 20, showCMF: true },
-            MFI: { period: 14, showMFI: true },
-            PIVOT: { showPP: true, showR1: true, showR2: true, showR3: false, showS1: true, showS2: true, showS3: false },
-            FIB: { period: 50, showLevels: true },
-            STRUCTURE: { leftWindow: 2, rightWindow: 2, breakoutSource: 'close', showSwingLabels: true, showBOS: true, showCHOCH: true, showProvisional: false },
-            ZONES: { showFVG: true, showOB: true, showFilledZones: true, obLookback: 5 },
-            VOLUME_PROFILE: { bins: 24, lookback: 0, valueAreaPercent: 0.7, showVolumeProfile: true },
-        }
-        return { ...(defaults[indicatorId] ?? {}) }
-    }
-
 
 
     /**