@visactor/vrender-core 1.1.0-alpha.8 → 1.1.0

package/es/graphic/state/shared-state-refresh.js

@@ -1,46 +1,27 @@
-import { getStageStatePerfMonitor } from "./state-perf-monitor";
-
 export function scheduleStageSharedStateRefresh(stage) {
-    var _a;
-    stage && "released" !== stage.releaseStatus && (null === (_a = getStageStatePerfMonitor(stage)) || void 0 === _a || _a.recordRefresh("renderScheduled"), 
-    stage.renderNextFrame());
+    stage && "released" !== stage.releaseStatus && stage.renderNextFrame();
 }
 
 export function enqueueGraphicSharedStateRefresh(stage, graphic) {
     var _a;
     if (!stage) return;
-    const pending = null !== (_a = stage._pendingSharedStateRefreshGraphics) && void 0 !== _a ? _a : stage._pendingSharedStateRefreshGraphics = new Set;
-    if (!pending.has(graphic)) {
-        pending.add(graphic);
-        const perfMonitor = getStageStatePerfMonitor(stage);
-        null == perfMonitor || perfMonitor.recordRefresh("queuedGraphics"), null == perfMonitor || perfMonitor.recordAllocation("refreshQueuePushes");
-    }
+    (null !== (_a = stage._pendingSharedStateRefreshGraphics) && void 0 !== _a ? _a : stage._pendingSharedStateRefreshGraphics = new Set).add(graphic);
 }
 
 export function markScopeActiveDescendantsDirty(scope, stage) {
-    let marked = !1;
-    scope.subtreeActiveDescendants.forEach((graphic => {
+    scope.subtreeActiveDescendants.size && (scope.subtreeActiveDescendants.forEach((graphic => {
         var _a;
         graphic.sharedStateDirty = !0;
-        enqueueGraphicSharedStateRefresh(null !== (_a = null != stage ? stage : graphic.stage) && void 0 !== _a ? _a : scope.ownerStage, graphic), 
-        marked = !0;
-    })), marked && scheduleStageSharedStateRefresh(null != stage ? stage : scope.ownerStage);
+        enqueueGraphicSharedStateRefresh(null !== (_a = null != stage ? stage : graphic.stage) && void 0 !== _a ? _a : scope.ownerStage, graphic);
+    })), scheduleStageSharedStateRefresh(null != stage ? stage : scope.ownerStage));
 }
 
 export function flushStageSharedStateRefresh(stage) {
     const pending = stage._pendingSharedStateRefreshGraphics;
     if (!pending || !pending.size) return;
-    const perfMonitor = getStageStatePerfMonitor(stage), start = perfMonitor ? performance.now() : 0, graphics = Array.from(pending.values());
-    pending.clear(), null == perfMonitor || perfMonitor.recordRefresh("flushedGraphics", graphics.length), 
-    graphics.forEach((graphic => {
-        if ("released" === graphic.releaseStatus) return;
-        if (graphic.stage !== stage) return;
-        const refresh = graphic.refreshSharedStateBeforeRender;
-        "function" == typeof refresh && (refresh.call(graphic), null == perfMonitor || perfMonitor.incrementCounter("sharedRefreshCommits"));
-    })), perfMonitor && (perfMonitor.recordCost("sharedRefresh", performance.now() - start), 
-    perfMonitor.recordEvent("shared-refresh-flush", {
-        stageId: stage._uid,
-        flushedGraphics: graphics.length
+    const graphics = Array.from(pending.values());
+    pending.clear(), graphics.forEach((graphic => {
+        "released" !== graphic.releaseStatus && graphic.stage === stage && graphic.sharedStateDirty && graphic.refreshSharedStateBeforeRender();
     }));
 }
 //# sourceMappingURL=shared-state-refresh.js.map

package/es/graphic/state/shared-state-refresh.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/state/shared-state-refresh.ts"],"names":[],"mappings":"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","file":"shared-state-refresh.js","sourcesContent":["import type { IGraphic, IStage } from '../../interface';\nimport type { SharedStateScope } from './shared-state-scope';\nimport { getStageStatePerfMonitor } from './state-perf-monitor';\n\nexport function scheduleStageSharedStateRefresh(stage: IStage | undefined): void {\n  if (!stage || (stage as any).releaseStatus === 'released') {\n    return;\n  }\n\n  getStageStatePerfMonitor(stage)?.recordRefresh('renderScheduled');\n  stage.renderNextFrame();\n}\n\nexport function enqueueGraphicSharedStateRefresh(stage: IStage | undefined, graphic: IGraphic): void {\n  if (!stage) {\n    return;\n  }\n\n  const pending =\n    ((stage as any)._pendingSharedStateRefreshGraphics as Set<IGraphic> | undefined) ??\n    (((stage as any)._pendingSharedStateRefreshGraphics = new Set<IGraphic>()) as Set<IGraphic>);\n\n  if (!pending.has(graphic)) {\n    pending.add(graphic);\n    const perfMonitor = getStageStatePerfMonitor(stage);\n    perfMonitor?.recordRefresh('queuedGraphics');\n    perfMonitor?.recordAllocation('refreshQueuePushes');\n  }\n}\n\nexport function markScopeActiveDescendantsDirty<T extends Record<string, any> = Record<string, any>>(\n  scope: SharedStateScope<T>,\n  stage?: IStage\n): void {\n  let marked = false;\n  scope.subtreeActiveDescendants.forEach(graphic => {\n    (graphic as any).sharedStateDirty = true;\n    const ownerStage = stage ?? graphic.stage ?? scope.ownerStage;\n    enqueueGraphicSharedStateRefresh(ownerStage, graphic);\n    marked = true;\n  });\n\n  if (marked) {\n    scheduleStageSharedStateRefresh(stage ?? scope.ownerStage);\n  }\n}\n\nexport function flushStageSharedStateRefresh(stage: IStage): void {\n  const pending = (stage as any)._pendingSharedStateRefreshGraphics as Set<IGraphic> | undefined;\n  if (!pending || !pending.size) {\n    return;\n  }\n\n  const perfMonitor = getStageStatePerfMonitor(stage);\n  const start = perfMonitor ? performance.now() : 0;\n  const graphics = Array.from(pending.values());\n  pending.clear();\n  perfMonitor?.recordRefresh('flushedGraphics', graphics.length);\n\n  graphics.forEach(graphic => {\n    if ((graphic as any).releaseStatus === 'released') {\n      return;\n    }\n    if (graphic.stage !== stage) {\n      return;\n    }\n\n    const refresh = (graphic as any).refreshSharedStateBeforeRender;\n    if (typeof refresh === 'function') {\n      refresh.call(graphic);\n      perfMonitor?.incrementCounter('sharedRefreshCommits');\n    }\n  });\n\n  if (perfMonitor) {\n    perfMonitor.recordCost('sharedRefresh', performance.now() - start);\n    perfMonitor.recordEvent('shared-refresh-flush', {\n      stageId: (stage as any)._uid,\n      flushedGraphics: graphics.length\n    });\n  }\n}\n"]}
+{"version":3,"sources":["../src/graphic/state/shared-state-refresh.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,+BAA+B,CAAC,KAAyB;IACvE,IAAI,CAAC,KAAK,IAAK,KAAa,CAAC,aAAa,KAAK,UAAU,EAAE;QACzD,OAAO;KACR;IAED,KAAK,CAAC,eAAe,EAAE,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,gCAAgC,CAAC,KAAyB,EAAE,OAAiB;;IAC3F,IAAI,CAAC,KAAK,EAAE;QACV,OAAO;KACR;IAED,MAAM,OAAO,GACX,MAAE,KAAa,CAAC,kCAAgE,mCAC/E,CAAE,KAAa,CAAC,kCAAkC,GAAG,IAAI,GAAG,EAAY,CAAmB,CAAC;IAE/F,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC7C,KAA0B,EAC1B,KAAc;IAEd,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,IAAI,EAAE;QACxC,OAAO;KACR;IAED,KAAK,CAAC,wBAAwB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;;QAC9C,OAAe,CAAC,gBAAgB,GAAG,IAAI,CAAC;QACzC,MAAM,UAAU,GAAG,MAAA,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,OAAO,CAAC,KAAK,mCAAI,KAAK,CAAC,UAAU,CAAC;QAC9D,gCAAgC,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,+BAA+B,CAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,KAAK,CAAC,UAAU,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,KAAa;IACxD,MAAM,OAAO,GAAI,KAAa,CAAC,kCAA+D,CAAC;IAC/F,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QAC7B,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9C,OAAO,CAAC,KAAK,EAAE,CAAC;IAEhB,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QACzB,IAAK,OAAe,CAAC,aAAa,KAAK,UAAU,EAAE;YACjD,OAAO;SACR;QACD,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE;YAC3B,OAAO;SACR;QACD,IAAI,CAAE,OAAe,CAAC,gBAAgB,EAAE;YACtC,OAAO;SACR;QAEA,OAAe,CAAC,8BAA8B,EAAE,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC","file":"shared-state-refresh.js","sourcesContent":["import type { IGraphic, IStage } from '../../interface';\nimport type { SharedStateScope } from './shared-state-scope';\n\nexport function scheduleStageSharedStateRefresh(stage: IStage | undefined): void {\n  if (!stage || (stage as any).releaseStatus === 'released') {\n    return;\n  }\n\n  stage.renderNextFrame();\n}\n\nexport function enqueueGraphicSharedStateRefresh(stage: IStage | undefined, graphic: IGraphic): void {\n  if (!stage) {\n    return;\n  }\n\n  const pending =\n    ((stage as any)._pendingSharedStateRefreshGraphics as Set<IGraphic> | undefined) ??\n    (((stage as any)._pendingSharedStateRefreshGraphics = new Set<IGraphic>()) as Set<IGraphic>);\n\n  pending.add(graphic);\n}\n\nexport function markScopeActiveDescendantsDirty<T extends Record<string, any> = Record<string, any>>(\n  scope: SharedStateScope<T>,\n  stage?: IStage\n): void {\n  if (!scope.subtreeActiveDescendants.size) {\n    return;\n  }\n\n  scope.subtreeActiveDescendants.forEach(graphic => {\n    (graphic as any).sharedStateDirty = true;\n    const ownerStage = stage ?? graphic.stage ?? scope.ownerStage;\n    enqueueGraphicSharedStateRefresh(ownerStage, graphic);\n  });\n\n  scheduleStageSharedStateRefresh(stage ?? scope.ownerStage);\n}\n\nexport function flushStageSharedStateRefresh(stage: IStage): void {\n  const pending = (stage as any)._pendingSharedStateRefreshGraphics as Set<IGraphic> | undefined;\n  if (!pending || !pending.size) {\n    return;\n  }\n\n  const graphics = Array.from(pending.values());\n  pending.clear();\n\n  graphics.forEach(graphic => {\n    if ((graphic as any).releaseStatus === 'released') {\n      return;\n    }\n    if (graphic.stage !== stage) {\n      return;\n    }\n    if (!(graphic as any).sharedStateDirty) {\n      return;\n    }\n\n    (graphic as any).refreshSharedStateBeforeRender();\n  });\n}\n"]}

package/es/graphic/state/shared-state-scope.d.ts

@@ -1,9 +1,6 @@
 import type { IGraphic, IStage } from '../../interface';
-import type { IGroup } from '../../interface/graphic/group';
 import type { CompiledStateDefinition, StateDefinitionsInput } from './state-definition';
 export interface SharedStateScope<T extends Record<string, any> = Record<string, any>> {
-    ownerKind: 'group' | 'root';
-    ownerGroup?: IGroup;
     ownerStage?: IStage;
     parentScope?: SharedStateScope<T>;
     themeStateDefinitions?: StateDefinitionsInput<T>;
@@ -16,10 +13,10 @@ export interface SharedStateScope<T extends Record<string, any> = Record<string,
     subtreeActiveDescendants: Set<IGraphic>;
 }
 export declare function createRootSharedStateScope<T extends Record<string, any> = Record<string, any>>(stage: IStage, themeStateDefinitions?: StateDefinitionsInput<T>): SharedStateScope<T>;
-export declare function createGroupSharedStateScope<T extends Record<string, any> = Record<string, any>>(group: IGroup, parentScope?: SharedStateScope<T>, localStateDefinitions?: StateDefinitionsInput<T>): SharedStateScope<T>;
+export declare function createGroupSharedStateScope<T extends Record<string, any> = Record<string, any>>(group: IGraphic, parentScope?: SharedStateScope<T>, localStateDefinitions?: StateDefinitionsInput<T>): SharedStateScope<T>;
 export declare function setSharedStateScopeParent<T extends Record<string, any> = Record<string, any>>(scope: SharedStateScope<T>, parentScope?: SharedStateScope<T>): boolean;
 export declare function setSharedStateScopeLocalDefinitions<T extends Record<string, any> = Record<string, any>>(scope: SharedStateScope<T>, localStateDefinitions?: StateDefinitionsInput<T>): boolean;
 export declare function setRootSharedStateScopeThemeDefinitions<T extends Record<string, any> = Record<string, any>>(scope: SharedStateScope<T>, themeStateDefinitions?: StateDefinitionsInput<T>): boolean;
-export declare function rebuildSharedStateScope<T extends Record<string, any> = Record<string, any>>(scope: SharedStateScope<T>): SharedStateScope<T>;
+export declare function rebuildSharedStateScope<T extends Record<string, any> = Record<string, any>>(scope: SharedStateScope<T>, revision?: number): SharedStateScope<T>;
 export declare function ensureSharedStateScopeFresh<T extends Record<string, any> = Record<string, any>>(scope?: SharedStateScope<T>): SharedStateScope<T> | undefined;
 export declare function collectSharedStateScopeChain<T extends Record<string, any> = Record<string, any>>(scope?: SharedStateScope<T>): SharedStateScope<T>[];

package/es/graphic/state/shared-state-scope.js

@@ -1,31 +1,13 @@
 import { StateDefinitionCompiler } from "./state-definition-compiler";
 
-import { getStageStatePerfMonitor } from "./state-perf-monitor";
-
 const compiler = new StateDefinitionCompiler;
 
-function copyDefinitions(definitions) {
-    return definitions ? Object.assign({}, definitions) : {};
-}
-
 function buildEffectiveSourceDefinitions(parentScope, localStateDefinitions, themeStateDefinitions) {
-    const merged = copyDefinitions(parentScope ? parentScope.effectiveSourceDefinitions : themeStateDefinitions);
-    return localStateDefinitions && Object.keys(localStateDefinitions).forEach((stateName => {
-        merged[stateName] = localStateDefinitions[stateName];
-    })), merged;
-}
-
-function initializeScope(scope, revision = 0) {
-    var _a;
-    const effectiveSourceDefinitions = buildEffectiveSourceDefinitions(scope.parentScope, scope.localStateDefinitions, scope.themeStateDefinitions);
-    return scope.effectiveSourceDefinitions = effectiveSourceDefinitions, scope.effectiveCompiledDefinitions = compiler.compile(effectiveSourceDefinitions), 
-    scope.parentRevisionAtBuild = null === (_a = scope.parentScope) || void 0 === _a ? void 0 : _a.revision, 
-    scope.revision = revision, scope.dirty = !1, scope;
+    return Object.assign({}, parentScope ? parentScope.effectiveSourceDefinitions : themeStateDefinitions, localStateDefinitions);
 }
 
 export function createRootSharedStateScope(stage, themeStateDefinitions) {
-    return initializeScope({
-        ownerKind: "root",
+    return rebuildSharedStateScope({
         ownerStage: stage,
         themeStateDefinitions: themeStateDefinitions,
         effectiveSourceDefinitions: {},
@@ -37,9 +19,7 @@ export function createRootSharedStateScope(stage, themeStateDefinitions) {
 }
 
 export function createGroupSharedStateScope(group, parentScope, localStateDefinitions) {
-    return initializeScope({
-        ownerKind: "group",
-        ownerGroup: group,
+    return rebuildSharedStateScope({
         ownerStage: group.stage,
         parentScope: parentScope,
         localStateDefinitions: localStateDefinitions,
@@ -66,18 +46,17 @@ export function setRootSharedStateScopeThemeDefinitions(scope, themeStateDefinit
     rebuildSharedStateScope(scope), !0);
 }
 
-export function rebuildSharedStateScope(scope) {
+export function rebuildSharedStateScope(scope, revision = scope.revision + 1) {
     var _a;
     const effectiveSourceDefinitions = buildEffectiveSourceDefinitions(scope.parentScope, scope.localStateDefinitions, scope.themeStateDefinitions);
     return scope.effectiveSourceDefinitions = effectiveSourceDefinitions, scope.effectiveCompiledDefinitions = compiler.compile(effectiveSourceDefinitions), 
     scope.parentRevisionAtBuild = null === (_a = scope.parentScope) || void 0 === _a ? void 0 : _a.revision, 
-    scope.revision += 1, scope.dirty = !1, scope;
+    scope.revision = revision, scope.dirty = !1, scope;
 }
 
 export function ensureSharedStateScopeFresh(scope) {
-    var _a;
-    if (scope) return null === (_a = getStageStatePerfMonitor(scope.ownerStage)) || void 0 === _a || _a.recordRefresh("ensureFreshCalls"), 
-    scope.parentScope && ensureSharedStateScopeFresh(scope.parentScope), (scope.dirty || scope.parentScope && scope.parentRevisionAtBuild !== scope.parentScope.revision) && rebuildSharedStateScope(scope), 
+    if (scope) return scope.parentScope && ensureSharedStateScopeFresh(scope.parentScope), 
+    (scope.dirty || scope.parentScope && scope.parentRevisionAtBuild !== scope.parentScope.revision) && rebuildSharedStateScope(scope), 
     scope;
 }
 

package/es/graphic/state/shared-state-scope.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/state/shared-state-scope.ts"],"names":[],"mappings":"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","file":"shared-state-scope.js","sourcesContent":["import type { IGraphic, IStage } from '../../interface';\nimport type { IGroup } from '../../interface/graphic/group';\nimport { StateDefinitionCompiler } from './state-definition-compiler';\nimport type { CompiledStateDefinition, StateDefinitionsInput } from './state-definition';\nimport { getStageStatePerfMonitor } from './state-perf-monitor';\n\nexport interface SharedStateScope<T extends Record<string, any> = Record<string, any>> {\n  ownerKind: 'group' | 'root';\n  ownerGroup?: IGroup;\n  ownerStage?: IStage;\n  parentScope?: SharedStateScope<T>;\n  themeStateDefinitions?: StateDefinitionsInput<T>;\n  localStateDefinitions?: StateDefinitionsInput<T>;\n  effectiveSourceDefinitions: StateDefinitionsInput<T>;\n  effectiveCompiledDefinitions: Map<string, CompiledStateDefinition<T>>;\n  revision: number;\n  parentRevisionAtBuild?: number;\n  dirty: boolean;\n  subtreeActiveDescendants: Set<IGraphic>;\n}\n\nconst compiler = new StateDefinitionCompiler<any>();\n\nfunction copyDefinitions<T extends Record<string, any>>(\n  definitions?: StateDefinitionsInput<T>\n): StateDefinitionsInput<T> {\n  return definitions ? ({ ...definitions } as StateDefinitionsInput<T>) : ({} as StateDefinitionsInput<T>);\n}\n\nfunction buildEffectiveSourceDefinitions<T extends Record<string, any>>(\n  parentScope?: SharedStateScope<T>,\n  localStateDefinitions?: StateDefinitionsInput<T>,\n  themeStateDefinitions?: StateDefinitionsInput<T>\n): StateDefinitionsInput<T> {\n  const merged = parentScope\n    ? copyDefinitions(parentScope.effectiveSourceDefinitions)\n    : copyDefinitions(themeStateDefinitions);\n\n  if (localStateDefinitions) {\n    Object.keys(localStateDefinitions).forEach(stateName => {\n      merged[stateName] = localStateDefinitions[stateName];\n    });\n  }\n\n  return merged;\n}\n\nfunction initializeScope<T extends Record<string, any>>(\n  scope: SharedStateScope<T>,\n  revision: number = 0\n): SharedStateScope<T> {\n  const effectiveSourceDefinitions = buildEffectiveSourceDefinitions(\n    scope.parentScope,\n    scope.localStateDefinitions,\n    scope.themeStateDefinitions\n  );\n\n  scope.effectiveSourceDefinitions = effectiveSourceDefinitions;\n  scope.effectiveCompiledDefinitions = compiler.compile(effectiveSourceDefinitions);\n  scope.parentRevisionAtBuild = scope.parentScope?.revision;\n  scope.revision = revision;\n  scope.dirty = false;\n\n  return scope;\n}\n\nexport function createRootSharedStateScope<T extends Record<string, any> = Record<string, any>>(\n  stage: IStage,\n  themeStateDefinitions?: StateDefinitionsInput<T>\n): SharedStateScope<T> {\n  return initializeScope(\n    {\n      ownerKind: 'root',\n      ownerStage: stage,\n      themeStateDefinitions,\n      effectiveSourceDefinitions: {} as StateDefinitionsInput<T>,\n      effectiveCompiledDefinitions: new Map(),\n      revision: 0,\n      dirty: false,\n      subtreeActiveDescendants: new Set()\n    },\n    0\n  );\n}\n\nexport function createGroupSharedStateScope<T extends Record<string, any> = Record<string, any>>(\n  group: IGroup,\n  parentScope?: SharedStateScope<T>,\n  localStateDefinitions?: StateDefinitionsInput<T>\n): SharedStateScope<T> {\n  return initializeScope(\n    {\n      ownerKind: 'group',\n      ownerGroup: group,\n      ownerStage: group.stage,\n      parentScope,\n      localStateDefinitions,\n      effectiveSourceDefinitions: {} as StateDefinitionsInput<T>,\n      effectiveCompiledDefinitions: new Map(),\n      revision: 0,\n      dirty: false,\n      subtreeActiveDescendants: new Set()\n    },\n    0\n  );\n}\n\nexport function setSharedStateScopeParent<T extends Record<string, any> = Record<string, any>>(\n  scope: SharedStateScope<T>,\n  parentScope?: SharedStateScope<T>\n): boolean {\n  if (scope.parentScope === parentScope) {\n    return false;\n  }\n\n  scope.parentScope = parentScope;\n  scope.dirty = true;\n  return true;\n}\n\nexport function setSharedStateScopeLocalDefinitions<T extends Record<string, any> = Record<string, any>>(\n  scope: SharedStateScope<T>,\n  localStateDefinitions?: StateDefinitionsInput<T>\n): boolean {\n  if (scope.localStateDefinitions === localStateDefinitions) {\n    return false;\n  }\n\n  scope.localStateDefinitions = localStateDefinitions;\n  rebuildSharedStateScope(scope);\n  return true;\n}\n\nexport function setRootSharedStateScopeThemeDefinitions<T extends Record<string, any> = Record<string, any>>(\n  scope: SharedStateScope<T>,\n  themeStateDefinitions?: StateDefinitionsInput<T>\n): boolean {\n  if (scope.themeStateDefinitions === themeStateDefinitions) {\n    return false;\n  }\n\n  scope.themeStateDefinitions = themeStateDefinitions;\n  rebuildSharedStateScope(scope);\n  return true;\n}\n\nexport function rebuildSharedStateScope<T extends Record<string, any> = Record<string, any>>(\n  scope: SharedStateScope<T>\n): SharedStateScope<T> {\n  const effectiveSourceDefinitions = buildEffectiveSourceDefinitions(\n    scope.parentScope,\n    scope.localStateDefinitions,\n    scope.themeStateDefinitions\n  );\n\n  scope.effectiveSourceDefinitions = effectiveSourceDefinitions;\n  scope.effectiveCompiledDefinitions = compiler.compile(effectiveSourceDefinitions);\n  scope.parentRevisionAtBuild = scope.parentScope?.revision;\n  scope.revision += 1;\n  scope.dirty = false;\n\n  return scope;\n}\n\nexport function ensureSharedStateScopeFresh<T extends Record<string, any> = Record<string, any>>(\n  scope?: SharedStateScope<T>\n): SharedStateScope<T> | undefined {\n  if (!scope) {\n    return undefined;\n  }\n\n  getStageStatePerfMonitor(scope.ownerStage)?.recordRefresh('ensureFreshCalls');\n\n  if (scope.parentScope) {\n    ensureSharedStateScopeFresh(scope.parentScope);\n  }\n\n  if (scope.dirty || (scope.parentScope && scope.parentRevisionAtBuild !== scope.parentScope.revision)) {\n    rebuildSharedStateScope(scope);\n  }\n\n  return scope;\n}\n\nexport function collectSharedStateScopeChain<T extends Record<string, any> = Record<string, any>>(\n  scope?: SharedStateScope<T>\n): SharedStateScope<T>[] {\n  const chain: SharedStateScope<T>[] = [];\n  let current = scope;\n\n  while (current) {\n    chain.push(current);\n    current = current.parentScope;\n  }\n\n  return chain;\n}\n"]}
+{"version":3,"sources":["../src/graphic/state/shared-state-scope.ts"],"names":[],"mappings":"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","file":"shared-state-scope.js","sourcesContent":["import type { IGraphic, IStage } from '../../interface';\nimport { StateDefinitionCompiler } from './state-definition-compiler';\nimport type { CompiledStateDefinition, StateDefinitionsInput } from './state-definition';\n\nexport interface SharedStateScope<T extends Record<string, any> = Record<string, any>> {\n  ownerStage?: IStage;\n  parentScope?: SharedStateScope<T>;\n  themeStateDefinitions?: StateDefinitionsInput<T>;\n  localStateDefinitions?: StateDefinitionsInput<T>;\n  effectiveSourceDefinitions: StateDefinitionsInput<T>;\n  effectiveCompiledDefinitions: Map<string, CompiledStateDefinition<T>>;\n  revision: number;\n  parentRevisionAtBuild?: number;\n  dirty: boolean;\n  subtreeActiveDescendants: Set<IGraphic>;\n}\n\nconst compiler = new StateDefinitionCompiler<any>();\n\nfunction buildEffectiveSourceDefinitions<T extends Record<string, any>>(\n  parentScope?: SharedStateScope<T>,\n  localStateDefinitions?: StateDefinitionsInput<T>,\n  themeStateDefinitions?: StateDefinitionsInput<T>\n): StateDefinitionsInput<T> {\n  return Object.assign(\n    {} as StateDefinitionsInput<T>,\n    parentScope ? parentScope.effectiveSourceDefinitions : themeStateDefinitions,\n    localStateDefinitions\n  );\n}\n\nexport function createRootSharedStateScope<T extends Record<string, any> = Record<string, any>>(\n  stage: IStage,\n  themeStateDefinitions?: StateDefinitionsInput<T>\n): SharedStateScope<T> {\n  return rebuildSharedStateScope(\n    {\n      ownerStage: stage,\n      themeStateDefinitions,\n      effectiveSourceDefinitions: {} as StateDefinitionsInput<T>,\n      effectiveCompiledDefinitions: new Map(),\n      revision: 0,\n      dirty: false,\n      subtreeActiveDescendants: new Set()\n    },\n    0\n  );\n}\n\nexport function createGroupSharedStateScope<T extends Record<string, any> = Record<string, any>>(\n  group: IGraphic,\n  parentScope?: SharedStateScope<T>,\n  localStateDefinitions?: StateDefinitionsInput<T>\n): SharedStateScope<T> {\n  return rebuildSharedStateScope(\n    {\n      ownerStage: group.stage,\n      parentScope,\n      localStateDefinitions,\n      effectiveSourceDefinitions: {} as StateDefinitionsInput<T>,\n      effectiveCompiledDefinitions: new Map(),\n      revision: 0,\n      dirty: false,\n      subtreeActiveDescendants: new Set()\n    },\n    0\n  );\n}\n\nexport function setSharedStateScopeParent<T extends Record<string, any> = Record<string, any>>(\n  scope: SharedStateScope<T>,\n  parentScope?: SharedStateScope<T>\n): boolean {\n  if (scope.parentScope === parentScope) {\n    return false;\n  }\n\n  scope.parentScope = parentScope;\n  scope.dirty = true;\n  return true;\n}\n\nexport function setSharedStateScopeLocalDefinitions<T extends Record<string, any> = Record<string, any>>(\n  scope: SharedStateScope<T>,\n  localStateDefinitions?: StateDefinitionsInput<T>\n): boolean {\n  if (scope.localStateDefinitions === localStateDefinitions) {\n    return false;\n  }\n\n  scope.localStateDefinitions = localStateDefinitions;\n  rebuildSharedStateScope(scope);\n  return true;\n}\n\nexport function setRootSharedStateScopeThemeDefinitions<T extends Record<string, any> = Record<string, any>>(\n  scope: SharedStateScope<T>,\n  themeStateDefinitions?: StateDefinitionsInput<T>\n): boolean {\n  if (scope.themeStateDefinitions === themeStateDefinitions) {\n    return false;\n  }\n\n  scope.themeStateDefinitions = themeStateDefinitions;\n  rebuildSharedStateScope(scope);\n  return true;\n}\n\nexport function rebuildSharedStateScope<T extends Record<string, any> = Record<string, any>>(\n  scope: SharedStateScope<T>,\n  revision: number = scope.revision + 1\n): SharedStateScope<T> {\n  const effectiveSourceDefinitions = buildEffectiveSourceDefinitions(\n    scope.parentScope,\n    scope.localStateDefinitions,\n    scope.themeStateDefinitions\n  );\n\n  scope.effectiveSourceDefinitions = effectiveSourceDefinitions;\n  scope.effectiveCompiledDefinitions = compiler.compile(effectiveSourceDefinitions);\n  scope.parentRevisionAtBuild = scope.parentScope?.revision;\n  scope.revision = revision;\n  scope.dirty = false;\n\n  return scope;\n}\n\nexport function ensureSharedStateScopeFresh<T extends Record<string, any> = Record<string, any>>(\n  scope?: SharedStateScope<T>\n): SharedStateScope<T> | undefined {\n  if (!scope) {\n    return undefined;\n  }\n\n  if (scope.parentScope) {\n    ensureSharedStateScopeFresh(scope.parentScope);\n  }\n\n  if (scope.dirty || (scope.parentScope && scope.parentRevisionAtBuild !== scope.parentScope.revision)) {\n    rebuildSharedStateScope(scope);\n  }\n\n  return scope;\n}\n\nexport function collectSharedStateScopeChain<T extends Record<string, any> = Record<string, any>>(\n  scope?: SharedStateScope<T>\n): SharedStateScope<T>[] {\n  const chain: SharedStateScope<T>[] = [];\n  let current = scope;\n\n  while (current) {\n    chain.push(current);\n    current = current.parentScope;\n  }\n\n  return chain;\n}\n"]}

package/es/graphic/state/state-definition-compiler.js

@@ -50,7 +50,6 @@ export class StateDefinitionCompiler {
             return {
                 name: null !== (_a = definition.name) && void 0 !== _a ? _a : name,
                 priority: null !== (_b = definition.priority) && void 0 !== _b ? _b : 0,
-                rank: definition.rank,
                 patch: normalizePatch(definition.patch),
                 resolver: definition.resolver,
                 declaredAffectedKeys: definition.declaredAffectedKeys,
@@ -69,14 +68,14 @@ export class StateDefinitionCompiler {
         compiled.forEach(((definition, name) => {
             rawRelationMap.set(name, new Set(definition[relation]));
         })), compiled.forEach(((definition, origin) => {
-            const closure = new Set, walk = (stateName, stack) => {
+            const closure = new Set, walk = (stateName, visiting) => {
                 const nextStates = rawRelationMap.get(stateName);
                 nextStates && nextStates.size && nextStates.forEach((nextState => {
-                    nextState !== origin ? stack.includes(nextState) ? console.warn(`[StateDefinitionCompiler] circular ${relation} relation detected: ${stack.join(" -> ")} -> ${nextState}`) : closure.has(nextState) || (closure.add(nextState), 
-                    walk(nextState, stack.concat(nextState))) : console.warn(`[StateDefinitionCompiler] circular ${relation} relation detected: ${stack.join(" -> ")} -> ${origin}`);
+                    nextState === origin || visiting.has(nextState) || closure.has(nextState) || (closure.add(nextState), 
+                    visiting.add(nextState), walk(nextState, visiting), visiting.delete(nextState));
                 }));
             };
-            walk(origin, [ origin ]), definition[relation] = closure;
+            walk(origin, new Set([ origin ])), definition[relation] = closure;
         }));
     }
 }

package/es/graphic/state/state-definition-compiler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/state/state-definition-compiler.ts"],"names":[],"mappings":"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","file":"state-definition-compiler.js","sourcesContent":["import type {\n  CompiledStateDefinition,\n  StateDefinition,\n  StateDefinitionsInput,\n  StateResolveContext\n} from './state-definition';\n\nconst FULL_DEFINITION_KEYS = new Set([\n  'name',\n  'patch',\n  'priority',\n  'exclude',\n  'suppress',\n  'resolver',\n  'declaredAffectedKeys'\n]);\n\nfunction isPlainObject(value: unknown): value is Record<string, any> {\n  return value != null && typeof value === 'object' && !Array.isArray(value);\n}\n\nfunction normalizePatch<T extends Record<string, any>>(value: unknown): Partial<T> | undefined {\n  return value == null ? undefined : (value as Partial<T>);\n}\n\nexport class StateDefinitionCompiler<T extends Record<string, any> = Record<string, any>> {\n  compile(\n    definitions: StateDefinitionsInput<T> = {} as StateDefinitionsInput<T>\n  ): Map<string, CompiledStateDefinition<T>> {\n    const normalizedEntries = Object.keys(definitions).map(name => {\n      const normalized = this.normalizeDefinition(name, definitions[name]);\n      return [name, normalized] as const;\n    });\n\n    const rankOrder = normalizedEntries\n      .map(([, definition]) => definition)\n      .sort((left, right) => {\n        const leftPriority = left.priority ?? 0;\n        const rightPriority = right.priority ?? 0;\n        if (leftPriority !== rightPriority) {\n          return leftPriority - rightPriority;\n        }\n        return left.name.localeCompare(right.name);\n      });\n\n    const rankMap = new Map<string, number>();\n    rankOrder.forEach((definition, index) => {\n      rankMap.set(definition.name, index);\n    });\n\n    const compiled = new Map<string, CompiledStateDefinition<T>>();\n    normalizedEntries.forEach(([, definition]) => {\n      const declaredAffectedKeys = definition.declaredAffectedKeys\n        ? new Set(Array.from(definition.declaredAffectedKeys))\n        : undefined;\n      const staticAffectedKeys = definition.patch ? new Set(Object.keys(definition.patch)) : new Set<string>();\n      const affectedKeys = new Set<string>(staticAffectedKeys);\n      declaredAffectedKeys?.forEach(key => affectedKeys.add(key));\n\n      compiled.set(definition.name, {\n        name: definition.name,\n        priority: definition.priority ?? 0,\n        rank: rankMap.get(definition.name) ?? 0,\n        patch: normalizePatch<T>(definition.patch),\n        resolver: definition.resolver,\n        declaredAffectedKeys,\n        exclude: new Set(definition.exclude ?? []),\n        suppress: new Set(definition.suppress ?? []),\n        hasResolver: typeof definition.resolver === 'function',\n        affectedKeys\n      });\n    });\n\n    this.expandRelationClosure(compiled, 'exclude');\n    this.expandRelationClosure(compiled, 'suppress');\n\n    return compiled;\n  }\n\n  private normalizeDefinition(name: string, value: Partial<T> | StateDefinition<T> | undefined): StateDefinition<T> {\n    if (value == null) {\n      return {\n        name,\n        priority: 0,\n        patch: undefined\n      };\n    }\n\n    const keys = isPlainObject(value) ? Object.keys(value) : [];\n    const hasFullKey = keys.some(key => FULL_DEFINITION_KEYS.has(key));\n    if (hasFullKey) {\n      const definition = value as StateDefinition<T>;\n      return {\n        name: definition.name ?? name,\n        priority: definition.priority ?? 0,\n        rank: definition.rank,\n        patch: normalizePatch<T>(definition.patch),\n        resolver: definition.resolver as ((ctx: StateResolveContext<T>) => Partial<T> | void) | undefined,\n        declaredAffectedKeys: definition.declaredAffectedKeys,\n        exclude: definition.exclude,\n        suppress: definition.suppress\n      };\n    }\n\n    return {\n      name,\n      priority: 0,\n      patch: value as Partial<T>\n    };\n  }\n\n  private expandRelationClosure(\n    compiled: Map<string, CompiledStateDefinition<T>>,\n    relation: 'exclude' | 'suppress'\n  ): void {\n    const rawRelationMap = new Map<string, Set<string>>();\n\n    compiled.forEach((definition, name) => {\n      rawRelationMap.set(name, new Set(definition[relation]));\n    });\n\n    compiled.forEach((definition, origin) => {\n      const closure = new Set<string>();\n      const walk = (stateName: string, stack: string[]) => {\n        const nextStates = rawRelationMap.get(stateName);\n        if (!nextStates || !nextStates.size) {\n          return;\n        }\n\n        nextStates.forEach(nextState => {\n          if (nextState === origin) {\n            console.warn(\n              `[StateDefinitionCompiler] circular ${relation} relation detected: ${stack.join(' -> ')} -> ${origin}`\n            );\n            return;\n          }\n\n          if (stack.includes(nextState)) {\n            console.warn(\n              `[StateDefinitionCompiler] circular ${relation} relation detected: ${stack.join(' -> ')} -> ${nextState}`\n            );\n            return;\n          }\n\n          if (closure.has(nextState)) {\n            return;\n          }\n\n          closure.add(nextState);\n          walk(nextState, stack.concat(nextState));\n        });\n      };\n\n      walk(origin, [origin]);\n      definition[relation] = closure;\n    });\n  }\n}\n"]}
+{"version":3,"sources":["../src/graphic/state/state-definition-compiler.ts"],"names":[],"mappings":"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","file":"state-definition-compiler.js","sourcesContent":["import type {\n  CompiledStateDefinition,\n  StateDefinition,\n  StateDefinitionsInput,\n  StateResolveContext\n} from './state-definition';\n\nconst FULL_DEFINITION_KEYS = new Set([\n  'name',\n  'patch',\n  'priority',\n  'exclude',\n  'suppress',\n  'resolver',\n  'declaredAffectedKeys'\n]);\n\nfunction isPlainObject(value: unknown): value is Record<string, any> {\n  return value != null && typeof value === 'object' && !Array.isArray(value);\n}\n\nfunction normalizePatch<T extends Record<string, any>>(value: unknown): Partial<T> | undefined {\n  return value == null ? undefined : (value as Partial<T>);\n}\n\nexport class StateDefinitionCompiler<T extends Record<string, any> = Record<string, any>> {\n  compile(\n    definitions: StateDefinitionsInput<T> = {} as StateDefinitionsInput<T>\n  ): Map<string, CompiledStateDefinition<T>> {\n    const normalizedEntries = Object.keys(definitions).map(name => {\n      const normalized = this.normalizeDefinition(name, definitions[name]);\n      return [name, normalized] as const;\n    });\n\n    const rankOrder = normalizedEntries\n      .map(([, definition]) => definition)\n      .sort((left, right) => {\n        const leftPriority = left.priority ?? 0;\n        const rightPriority = right.priority ?? 0;\n        if (leftPriority !== rightPriority) {\n          return leftPriority - rightPriority;\n        }\n        return left.name.localeCompare(right.name);\n      });\n\n    const rankMap = new Map<string, number>();\n    rankOrder.forEach((definition, index) => {\n      rankMap.set(definition.name, index);\n    });\n\n    const compiled = new Map<string, CompiledStateDefinition<T>>();\n    normalizedEntries.forEach(([, definition]) => {\n      const declaredAffectedKeys = definition.declaredAffectedKeys\n        ? new Set(Array.from(definition.declaredAffectedKeys))\n        : undefined;\n      const staticAffectedKeys = definition.patch ? new Set(Object.keys(definition.patch)) : new Set<string>();\n      const affectedKeys = new Set<string>(staticAffectedKeys);\n      declaredAffectedKeys?.forEach(key => affectedKeys.add(key));\n\n      compiled.set(definition.name, {\n        name: definition.name,\n        priority: definition.priority ?? 0,\n        rank: rankMap.get(definition.name) ?? 0,\n        patch: normalizePatch<T>(definition.patch),\n        resolver: definition.resolver,\n        declaredAffectedKeys,\n        exclude: new Set(definition.exclude ?? []),\n        suppress: new Set(definition.suppress ?? []),\n        hasResolver: typeof definition.resolver === 'function',\n        affectedKeys\n      });\n    });\n\n    this.expandRelationClosure(compiled, 'exclude');\n    this.expandRelationClosure(compiled, 'suppress');\n\n    return compiled;\n  }\n\n  private normalizeDefinition(name: string, value: Partial<T> | StateDefinition<T> | undefined): StateDefinition<T> {\n    if (value == null) {\n      return {\n        name,\n        priority: 0,\n        patch: undefined\n      };\n    }\n\n    const keys = isPlainObject(value) ? Object.keys(value) : [];\n    const hasFullKey = keys.some(key => FULL_DEFINITION_KEYS.has(key));\n    if (hasFullKey) {\n      const definition = value as StateDefinition<T>;\n      return {\n        name: definition.name ?? name,\n        priority: definition.priority ?? 0,\n        patch: normalizePatch<T>(definition.patch),\n        resolver: definition.resolver as ((ctx: StateResolveContext<T>) => Partial<T> | void) | undefined,\n        declaredAffectedKeys: definition.declaredAffectedKeys,\n        exclude: definition.exclude,\n        suppress: definition.suppress\n      };\n    }\n\n    return {\n      name,\n      priority: 0,\n      patch: value as Partial<T>\n    };\n  }\n\n  private expandRelationClosure(\n    compiled: Map<string, CompiledStateDefinition<T>>,\n    relation: 'exclude' | 'suppress'\n  ): void {\n    const rawRelationMap = new Map<string, Set<string>>();\n\n    compiled.forEach((definition, name) => {\n      rawRelationMap.set(name, new Set(definition[relation]));\n    });\n\n    compiled.forEach((definition, origin) => {\n      const closure = new Set<string>();\n      const walk = (stateName: string, visiting: Set<string>) => {\n        const nextStates = rawRelationMap.get(stateName);\n        if (!nextStates || !nextStates.size) {\n          return;\n        }\n\n        nextStates.forEach(nextState => {\n          if (nextState === origin || visiting.has(nextState) || closure.has(nextState)) {\n            return;\n          }\n\n          closure.add(nextState);\n          visiting.add(nextState);\n          walk(nextState, visiting);\n          visiting.delete(nextState);\n        });\n      };\n\n      walk(origin, new Set([origin]));\n      definition[relation] = closure;\n    });\n  }\n}\n"]}

package/es/graphic/state/state-definition.d.ts

@@ -1,13 +1,13 @@
 export interface StateDefinition<T extends Record<string, any> = Record<string, any>> {
     name: string;
     priority?: number;
-    rank?: number;
     patch?: Partial<T>;
     resolver?: (ctx: StateResolveContext<T>) => Partial<T> | void;
     declaredAffectedKeys?: string[] | Set<string>;
     exclude?: string[];
     suppress?: string[];
 }
+export type StateMergeMode = 'shallow' | 'deep';
 export interface CompiledStateDefinition<T extends Record<string, any> = Record<string, any>> {
     name: string;
     priority: number;
@@ -37,8 +37,5 @@ export type StateDefinitionsInput<T extends Record<string, any> = Record<string,
 export interface IStateEngineOptions<T extends Record<string, any> = Record<string, any>> {
     compiledDefinitions: Map<string, CompiledStateDefinition<T>>;
     stateSort?: (a: string, b: string) => number;
-    stateProxy?: (stateName: string, targetStates?: string[]) => Partial<T> | undefined;
-    stateProxyEligibility?: (stateName: string) => boolean;
-    states?: StateDefinitionsInput<T>;
-    mergeMode?: 'shallow' | 'deep';
+    mergeMode?: StateMergeMode;
 }

package/es/graphic/state/state-definition.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/state/state-definition.ts"],"names":[],"mappings":"","file":"state-definition.js","sourcesContent":["export interface StateDefinition<T extends Record<string, any> = Record<string, any>> {\n  name: string;\n  priority?: number;\n  rank?: number;\n  patch?: Partial<T>;\n  resolver?: (ctx: StateResolveContext<T>) => Partial<T> | void;\n  declaredAffectedKeys?: string[] | Set<string>;\n  exclude?: string[];\n  suppress?: string[];\n}\n\nexport interface CompiledStateDefinition<T extends Record<string, any> = Record<string, any>> {\n  name: string;\n  priority: number;\n  rank: number;\n  patch?: Partial<T>;\n  resolver?: (ctx: StateResolveContext<T>) => Partial<T> | void;\n  declaredAffectedKeys?: Set<string>;\n  exclude: Set<string>;\n  suppress: Set<string>;\n  hasResolver: boolean;\n  affectedKeys: Set<string>;\n}\n\nexport interface StateResolveContext<T extends Record<string, any> = Record<string, any>> {\n  graphic: any;\n  activeStates: ReadonlyArray<string>;\n  effectiveStates: ReadonlyArray<string>;\n  baseAttributes: Partial<T>;\n  resolvedPatch: Partial<T>;\n}\n\nexport interface StateTransitionResult {\n  changed: boolean;\n  activeStates: string[];\n  effectiveStates: string[];\n  suppressed: string[];\n}\n\nexport type StateDefinitionsInput<T extends Record<string, any> = Record<string, any>> = Record<\n  string,\n  Partial<T> | StateDefinition<T>\n>;\n\nexport interface IStateEngineOptions<T extends Record<string, any> = Record<string, any>> {\n  compiledDefinitions: Map<string, CompiledStateDefinition<T>>;\n  stateSort?: (a: string, b: string) => number;\n  stateProxy?: (stateName: string, targetStates?: string[]) => Partial<T> | undefined;\n  stateProxyEligibility?: (stateName: string) => boolean;\n  states?: StateDefinitionsInput<T>;\n  mergeMode?: 'shallow' | 'deep';\n}\n"]}
+{"version":3,"sources":["../src/graphic/state/state-definition.ts"],"names":[],"mappings":"","file":"state-definition.js","sourcesContent":["export interface StateDefinition<T extends Record<string, any> = Record<string, any>> {\n  name: string;\n  priority?: number;\n  patch?: Partial<T>;\n  resolver?: (ctx: StateResolveContext<T>) => Partial<T> | void;\n  declaredAffectedKeys?: string[] | Set<string>;\n  exclude?: string[];\n  suppress?: string[];\n}\n\nexport type StateMergeMode = 'shallow' | 'deep';\n\nexport interface CompiledStateDefinition<T extends Record<string, any> = Record<string, any>> {\n  name: string;\n  priority: number;\n  rank: number;\n  patch?: Partial<T>;\n  resolver?: (ctx: StateResolveContext<T>) => Partial<T> | void;\n  declaredAffectedKeys?: Set<string>;\n  exclude: Set<string>;\n  suppress: Set<string>;\n  hasResolver: boolean;\n  affectedKeys: Set<string>;\n}\n\nexport interface StateResolveContext<T extends Record<string, any> = Record<string, any>> {\n  graphic: any;\n  activeStates: ReadonlyArray<string>;\n  effectiveStates: ReadonlyArray<string>;\n  baseAttributes: Partial<T>;\n  resolvedPatch: Partial<T>;\n}\n\nexport interface StateTransitionResult {\n  changed: boolean;\n  activeStates: string[];\n  effectiveStates: string[];\n  suppressed: string[];\n}\n\nexport type StateDefinitionsInput<T extends Record<string, any> = Record<string, any>> = Record<\n  string,\n  Partial<T> | StateDefinition<T>\n>;\n\nexport interface IStateEngineOptions<T extends Record<string, any> = Record<string, any>> {\n  compiledDefinitions: Map<string, CompiledStateDefinition<T>>;\n  stateSort?: (a: string, b: string) => number;\n  mergeMode?: StateMergeMode;\n}\n"]}

package/es/graphic/state/state-engine.d.ts

@@ -2,9 +2,6 @@ import type { IStateEngineOptions, StateTransitionResult } from './state-definit
 export declare class StateEngine<T extends Record<string, any> = Record<string, any>> {
     private readonly compiledDefinitions;
     private readonly stateSort?;
-    private readonly stateProxy?;
-    private readonly stateProxyEligibility?;
-    private readonly states?;
     private readonly mergeMode;
     private _activeStates;
     private _effectiveStates;
@@ -28,11 +25,9 @@ export declare class StateEngine<T extends Record<string, any> = Record<string,
     clearStates(): StateTransitionResult;
     invalidateResolverCache(): void;
     hasState(stateName?: string): boolean;
-    getCompatPatch(stateName: string): Partial<T> | undefined;
     private sortStates;
     private adjudicate;
     private recomputePatch;
     private mergeInto;
     private sameArray;
-    private canUseStateProxy;
 }

package/es/graphic/state/state-engine.js

@@ -1,5 +1,3 @@
-import { getStageStatePerfMonitor } from "./state-perf-monitor";
-
 function isPlainObject(value) {
     return null != value && "object" == typeof value && !Array.isArray(value);
 }
@@ -21,16 +19,13 @@ function deepMerge(base, value) {
     })), result;
 }
 
-const FULL_DEFINITION_KEYS = new Set([ "name", "patch", "priority", "exclude", "suppress", "resolver", "declaredAffectedKeys" ]);
-
 export class StateEngine {
     constructor(options) {
         var _a;
         this._activeStates = [], this._effectiveStates = [], this._suppressed = [], this._resolvedPatch = {}, 
         this.resolverPatchCache = new Map, this.resolverCacheKey = "", this.resolverCacheValid = !1, 
         this.baseAttributes = {}, this.compiledDefinitions = options.compiledDefinitions, 
-        this.stateSort = options.stateSort, this.stateProxy = options.stateProxy, this.stateProxyEligibility = options.stateProxyEligibility, 
-        this.states = options.states, this.mergeMode = null !== (_a = options.mergeMode) && void 0 !== _a ? _a : "shallow";
+        this.stateSort = options.stateSort, this.mergeMode = null !== (_a = options.mergeMode) && void 0 !== _a ? _a : "shallow";
     }
     get activeStates() {
         return this._activeStates;
@@ -45,6 +40,7 @@ export class StateEngine {
         return this._suppressed;
     }
     setResolveContext(graphic, baseAttributes) {
+        this.graphic === graphic && this.baseAttributes === baseAttributes || this.invalidateResolverCache(), 
         this.graphic = graphic, this.baseAttributes = baseAttributes;
     }
     applyStates(stateNames) {
@@ -98,22 +94,11 @@ export class StateEngine {
         };
     }
     invalidateResolverCache() {
-        var _a, _b;
-        this.resolverPatchCache.clear(), this.resolverCacheKey = "", this.resolverCacheValid = !1, 
-        null === (_b = getStageStatePerfMonitor(null === (_a = this.graphic) || void 0 === _a ? void 0 : _a.stage)) || void 0 === _b || _b.recordResolver("invalidations");
+        this.resolverPatchCache.clear(), this.resolverCacheKey = "", this.resolverCacheValid = !1;
     }
     hasState(stateName) {
         return !!this._activeStates.length && (null == stateName || this._activeStates.includes(stateName));
     }
-    getCompatPatch(stateName) {
-        var _a, _b, _c;
-        const targetStates = this._activeStates.length ? this._activeStates : this._effectiveStates, canUseStateProxy = this.canUseStateProxy(stateName), proxyPatch = canUseStateProxy ? null === (_a = this.stateProxy) || void 0 === _a ? void 0 : _a.call(this, stateName, targetStates) : void 0;
-        if (this.stateProxy && canUseStateProxy) return null != proxyPatch ? proxyPatch : void 0;
-        const value = null === (_b = this.states) || void 0 === _b ? void 0 : _b[stateName];
-        if (null == value) return;
-        if (!isPlainObject(value)) return value;
-        return Object.keys(value).some((key => FULL_DEFINITION_KEYS.has(key))) ? cloneValue(null !== (_c = value.patch) && void 0 !== _c ? _c : void 0) : value;
-    }
     sortStates(states) {
         const withDefinition = [], withoutDefinition = [];
         return states.forEach((stateName => {
@@ -141,55 +126,24 @@ export class StateEngine {
         };
     }
     recomputePatch(effectiveStates) {
-        var _a;
-        const perfMonitor = getStageStatePerfMonitor(null === (_a = this.graphic) || void 0 === _a ? void 0 : _a.stage), patchStart = perfMonitor ? performance.now() : 0;
-        let resolverCost = 0;
-        const cacheKey = effectiveStates.join(","), nextPatch = {};
-        if (null == perfMonitor || perfMonitor.recordAllocation("patchObjectsCreated"), 
-        this.resolverCacheValid && this.resolverCacheKey === cacheKey ? effectiveStates.forEach((stateName => {
+        const cacheKey = effectiveStates.join(","), nextPatch = {}, useResolverCache = this.resolverCacheValid && this.resolverCacheKey === cacheKey;
+        useResolverCache || (this.resolverPatchCache.clear(), this.resolverCacheKey = cacheKey), 
+        effectiveStates.forEach((stateName => {
             var _a;
-            const canUseStateProxy = this.canUseStateProxy(stateName), proxyPatch = canUseStateProxy ? null === (_a = this.stateProxy) || void 0 === _a ? void 0 : _a.call(this, stateName, effectiveStates) : void 0;
-            if (this.stateProxy && canUseStateProxy) return void (null != proxyPatch && this.mergeInto(nextPatch, proxyPatch));
             const definition = this.compiledDefinitions.get(stateName);
-            if (definition) {
-                if (definition.patch && this.mergeInto(nextPatch, definition.patch), definition.hasResolver) {
-                    const cachedPatch = this.resolverPatchCache.get(stateName);
-                    cachedPatch && (null == perfMonitor || perfMonitor.recordResolver("cacheHits"), 
-                    this.mergeInto(nextPatch, cachedPatch));
-                }
-            } else {
-                const compatPatch = this.getCompatPatch(stateName);
-                compatPatch && this.mergeInto(nextPatch, compatPatch);
+            if (definition && (definition.patch && this.mergeInto(nextPatch, definition.patch), 
+            definition.hasResolver)) {
+                const resolverPatch = useResolverCache ? this.resolverPatchCache.get(stateName) : null === (_a = definition.resolver) || void 0 === _a ? void 0 : _a.call(definition, {
+                    graphic: this.graphic,
+                    activeStates: this._activeStates,
+                    effectiveStates: this._effectiveStates,
+                    baseAttributes: this.baseAttributes,
+                    resolvedPatch: nextPatch
+                });
+                resolverPatch && (useResolverCache || this.resolverPatchCache.set(stateName, resolverPatch), 
+                this.mergeInto(nextPatch, resolverPatch));
             }
-        })) : (this.resolverPatchCache.clear(), this.resolverCacheKey = cacheKey, effectiveStates.forEach((stateName => {
-            var _a;
-            const canUseStateProxy = this.canUseStateProxy(stateName), proxyPatch = canUseStateProxy ? null === (_a = this.stateProxy) || void 0 === _a ? void 0 : _a.call(this, stateName, effectiveStates) : void 0;
-            if (this.stateProxy && canUseStateProxy) return void (null != proxyPatch && this.mergeInto(nextPatch, proxyPatch));
-            const definition = this.compiledDefinitions.get(stateName);
-            if (definition) {
-                if (definition.patch && this.mergeInto(nextPatch, definition.patch), definition.hasResolver && definition.resolver) {
-                    null == perfMonitor || perfMonitor.recordResolver("cacheMisses");
-                    const resolverStart = perfMonitor ? performance.now() : 0, resolverPatch = definition.resolver({
-                        graphic: this.graphic,
-                        activeStates: this._activeStates,
-                        effectiveStates: this._effectiveStates,
-                        baseAttributes: this.baseAttributes,
-                        resolvedPatch: nextPatch
-                    });
-                    if (perfMonitor) {
-                        const duration = performance.now() - resolverStart;
-                        resolverCost += duration, perfMonitor.recordCost("resolver", duration);
-                    }
-                    resolverPatch && (this.resolverPatchCache.set(stateName, resolverPatch), this.mergeInto(nextPatch, resolverPatch));
-                }
-            } else {
-                const compatPatch = this.getCompatPatch(stateName);
-                compatPatch && this.mergeInto(nextPatch, compatPatch);
-            }
-        })), this.resolverCacheValid = !0), this._resolvedPatch = nextPatch, perfMonitor) {
-            const totalCost = performance.now() - patchStart;
-            perfMonitor.recordCost("patch", Math.max(0, totalCost - resolverCost));
-        }
+        })), useResolverCache || (this.resolverCacheValid = !0), this._resolvedPatch = nextPatch;
     }
     mergeInto(target, patch) {
         "deep" !== this.mergeMode ? Object.keys(patch).forEach((key => {
@@ -205,8 +159,5 @@ export class StateEngine {
         for (let index = 0; index < left.length; index++) if (left[index] !== right[index]) return !1;
         return !0;
     }
-    canUseStateProxy(stateName) {
-        return !!this.stateProxy && (!this.stateProxyEligibility || this.stateProxyEligibility(stateName));
-    }
 }
 //# sourceMappingURL=state-engine.js.map