@363045841yyt/klinechart-core 0.7.9 → 0.7.11

package/src/engine/indicators/indicatorRegistry.ts

@@ -8,6 +8,26 @@ import type { IndicatorMetadata } from './indicatorMetadata'
  */
 export class IndicatorRegistry {
     private indicators = new Map<string, IndicatorMetadata>()
+    private aliases = new Map<string, string>()
+
+    private normalize(id: string): string {
+        return id.trim().toLowerCase().replace(/[^a-z0-9]/g, '')
+    }
+
+    private indexAlias(alias: string, name: string): void {
+        const normalized = this.normalize(alias)
+        if (normalized) {
+            this.aliases.set(normalized, name)
+        }
+    }
+
+    private removeAliasesFor(name: string): void {
+        for (const [alias, target] of this.aliases) {
+            if (target === name) {
+                this.aliases.delete(alias)
+            }
+        }
+    }
 
     /**
      * 注册指标
@@ -28,12 +48,23 @@ export class IndicatorRegistry {
             throw new Error(`[IndicatorRegistry] rendererFactory is required for indicator '${meta.name}'`)
         }
 
+        const normalizedName = this.normalize(meta.name)
+        if (!normalizedName) {
+            throw new Error('[IndicatorRegistry] Indicator name is required')
+        }
+
         // 检查重复注册
-        if (this.indicators.has(meta.name)) {
+        if (this.indicators.has(normalizedName)) {
             console.warn(`[IndicatorRegistry] Indicator '${meta.name}' already registered, overwriting`)
+            this.removeAliasesFor(normalizedName)
         }
 
-        this.indicators.set(meta.name, meta as IndicatorMetadata)
+        this.indicators.set(normalizedName, meta as IndicatorMetadata)
+        this.indexAlias(meta.name, normalizedName)
+        this.indexAlias(meta.displayName, normalizedName)
+        for (const alias of meta.aliases ?? []) {
+            this.indexAlias(alias, normalizedName)
+        }
     }
 
     /**
@@ -42,7 +73,14 @@ export class IndicatorRegistry {
      * @returns 是否成功注销
      */
     unregister(name: string): boolean {
-        return this.indicators.delete(name)
+        const normalizedName = this.normalize(name)
+        const canonicalName = this.aliases.get(normalizedName) ?? normalizedName
+        const meta = this.indicators.get(canonicalName)
+        if (!meta) return false
+
+        this.indicators.delete(canonicalName)
+        this.removeAliasesFor(canonicalName)
+        return true
     }
 
     /**
@@ -51,7 +89,17 @@ export class IndicatorRegistry {
      * @returns 元数据或 undefined
      */
     get(name: string): IndicatorMetadata | undefined {
-        return this.indicators.get(name)
+        const normalizedName = this.normalize(name)
+        const canonicalName = this.aliases.get(normalizedName) ?? normalizedName
+        return this.indicators.get(canonicalName)
+    }
+
+    getRequired(name: string): IndicatorMetadata {
+        const meta = this.get(name)
+        if (!meta) {
+            throw new Error(`[IndicatorRegistry] Unknown indicator '${name}'`)
+        }
+        return meta
     }
 
     /**
@@ -59,7 +107,7 @@ export class IndicatorRegistry {
      * @param name - 指标名称
      */
     has(name: string): boolean {
-        return this.indicators.has(name)
+        return this.get(name) !== undefined
     }
 
     /**
@@ -95,6 +143,7 @@ export class IndicatorRegistry {
      */
     clear(): void {
         this.indicators.clear()
+        this.aliases.clear()
     }
 
     /**

package/src/engine/indicators/registerBuiltins.ts

@@ -0,0 +1,47 @@
+import '../renderers/subVolume'
+import '../renderers/Indicator/atr'
+import '../renderers/Indicator/boll'
+import '../renderers/Indicator/cci'
+import '../renderers/Indicator/chaikinVol'
+import '../renderers/Indicator/cmf'
+import '../renderers/Indicator/dema'
+import '../renderers/Indicator/donchian'
+import '../renderers/Indicator/ene'
+import '../renderers/Indicator/expma'
+import '../renderers/Indicator/fastk'
+import '../renderers/Indicator/fib'
+import '../renderers/Indicator/hma'
+import '../renderers/Indicator/hv'
+import '../renderers/Indicator/ichimoku'
+import '../renderers/Indicator/kama'
+import '../renderers/Indicator/keltner'
+import '../renderers/Indicator/kst'
+import '../renderers/Indicator/ma'
+import '../renderers/Indicator/macd'
+import '../renderers/Indicator/mfi'
+import '../renderers/Indicator/mom'
+import '../renderers/Indicator/obv'
+import '../renderers/Indicator/parkinson'
+import '../renderers/Indicator/pivot'
+import '../renderers/Indicator/pvt'
+import '../renderers/Indicator/roc'
+import '../renderers/Indicator/rsi'
+import '../renderers/Indicator/sar'
+import '../renderers/Indicator/stoch'
+import '../renderers/Indicator/structure'
+import '../renderers/Indicator/supertrend'
+import '../renderers/Indicator/tema'
+import '../renderers/Indicator/trix'
+import '../renderers/Indicator/vma'
+import '../renderers/Indicator/volumeProfile'
+import '../renderers/Indicator/vwap'
+import '../renderers/Indicator/wma'
+import '../renderers/Indicator/wmsr'
+import '../renderers/Indicator/zones'
+import { getRegisteredIndicatorDefinitions } from './indicatorDefinitionRegistry'
+
+const builtinIndicatorDefinitions = getRegisteredIndicatorDefinitions()
+
+export function getBuiltinIndicatorDefinitions() {
+    return builtinIndicatorDefinitions
+}

package/src/engine/indicators/scheduler.ts

@@ -63,7 +63,7 @@ import type {
 } from './workerProtocol'
 import type { MAFlags } from './calculators'
 import { IndicatorRegistry } from './indicatorRegistry'
-import type { IndicatorMetadata } from './indicatorMetadata'
+import { resolveStateKey, type IndicatorMetadata } from './indicatorMetadata'
 import type { BaseIndicatorState } from '../../plugin'
 
 // Default constants for default config
@@ -519,8 +519,10 @@ export class IndicatorScheduler {
                 this.workerReady = true
                 this.useWorker = true
                 console.log('[IndicatorScheduler] Worker READY - using Worker backend')
-                // Worker 就绪后立即补算一次，确保后续走 Worker
-                this.triggerRecompute()
+                // Worker 就绪后补算一次，但仅在有数据时（避免空数据产出 Infinity 极值）
+                if (this.currentData.length > 0) {
+                    this.triggerRecompute()
+                }
                 break
 
             case 'seriesResult':
@@ -584,7 +586,12 @@ export class IndicatorScheduler {
 
         const changed = new Set(bundle._changed)
         const timestamp = Date.now()
-        const states = composeRenderStates(bundle, this.visibleRange, timestamp)
+        const states = composeRenderStates(
+            bundle,
+            this.visibleRange,
+            timestamp,
+            (indicatorId) => this.registry.get(indicatorId),
+        )
 
         for (const meta of this.registry.getAll()) {
             if (!changed.has(meta.name)) continue
@@ -606,19 +613,49 @@ export class IndicatorScheduler {
         }
     }
 
-    /** 仅副图：重算可见范围极值并回调 applyResult（视口变更时同步更新，不走 Worker） */
-    private updateVisibleStatesOnly(): void {
-        if (!this.pluginHost || !this.latestResult) return
+    /** 重算可见范围极值并回调 applyResult（视口变更时同步更新，不走 Worker） */
+    private updateVisibleStatesOnly(): boolean {
+        if (!this.pluginHost || !this.latestResult) return false
 
         const timestamp = Date.now()
+        let mainStates: Record<string, unknown> | null = null
+        let mainStateUpdated = false
         const activeMask = this.buildActiveSubIndicatorMask()
-        const states = composeVisibleSubIndicatorStates(this.latestResult, this.visibleRange, timestamp, activeMask)
+        const subStates = composeVisibleSubIndicatorStates(
+            this.latestResult,
+            this.visibleRange,
+            timestamp,
+            activeMask,
+            (indicatorId) => this.registry.get(indicatorId),
+        ) as Record<string, unknown>
 
         for (const meta of this.registry.getAll()) {
             if (!meta.applyResult) continue
-            if (!meta.paneIdField && meta.category === 'main') continue
 
-            const state = (states as Record<string, unknown>)[meta.name]
+            let state: unknown
+            if (meta.category === 'main') {
+                const paneId = meta.paneIdField
+                    ? (this.configSnapshot as unknown as Record<string, string>)[meta.paneIdField as string]
+                    : meta.defaultPaneId
+                const current = this.pluginHost.getSharedState<BaseIndicatorState & { visibleMin?: number; visibleMax?: number }>(
+                    resolveStateKey(meta.stateKey, paneId),
+                )
+                const currentValid = current &&
+                    Number.isFinite(current.visibleMin) &&
+                    Number.isFinite(current.visibleMax) &&
+                    current.visibleMin! <= current.visibleMax!
+                if (currentValid) continue
+
+                mainStates ??= composeRenderStates(
+                    this.latestResult,
+                    this.visibleRange,
+                    timestamp,
+                    (indicatorId) => this.registry.get(indicatorId),
+                ) as Record<string, unknown>
+                state = mainStates[meta.name]
+            } else {
+                state = subStates[meta.name]
+            }
             if (state === undefined) continue
 
             this.checkVisibleExtremes(
@@ -631,7 +668,12 @@ export class IndicatorScheduler {
                 : meta.defaultPaneId
 
             meta.applyResult(this.pluginHost, state as BaseIndicatorState, paneId)
+            if (meta.category === 'main') {
+                mainStateUpdated = true
+            }
         }
+
+        return mainStateUpdated
     }
 
     /** 遍历注册表，标记当前可见副图，仅这些指标参与计算 */
@@ -696,7 +738,10 @@ export class IndicatorScheduler {
 
         // 基于缓存的 series 同步更新极值
         if (this.latestResult) {
-            this.updateVisibleStatesOnly()
+            const mainStateUpdated = this.updateVisibleStatesOnly()
+            if (mainStateUpdated) {
+                this.invalidateCallback?.()
+            }
         }
     }
 
@@ -1114,11 +1159,13 @@ export class IndicatorScheduler {
      */
     getMainIndicatorPriceRange(): { min: number; max: number } | null {
         if (!this.latestResult) return null
-        return computeMainIndicatorPriceRange(
+        const result = computeMainIndicatorPriceRange(
             this.latestResult,
             this.visibleRange,
-            this.activeMainIndicators
+            this.activeMainIndicators,
+            (indicatorId) => this.registry.get(indicatorId),
         )
+        return result
     }
 
     /**
@@ -1139,6 +1186,7 @@ export class IndicatorScheduler {
     // ============================================================================
 
     private triggerRecompute(): void {
+        if (this.currentData.length === 0) return
         if (this.useWorker && this.worker && this.workerReady) {
             this.computeWithWorker()
         } else {