@darajs/core 1.17.6 → 1.18.0

package/dist/actions/reset-variables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reset-variables.d.ts","sourceRoot":"","sources":["../../js/actions/reset-variables.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAU3E;;;GAGG;AACH,QAAA,MAAM,cAAc,EAAE,aAAa,CAAC,kBAAkB,CA4BrD,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"reset-variables.d.ts","sourceRoot":"","sources":["../../js/actions/reset-variables.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAU3E;;;GAGG;AACH,QAAA,MAAM,cAAc,EAAE,aAAa,CAAC,kBAAkB,CA4BrD,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/dist/actions/reset-variables.js

@@ -1,3 +1,4 @@
+import { nanoid } from 'nanoid';
 import { getOrRegisterPlainVariable } from '../shared/interactivity/plain-variable';
 import { getOrRegisterTrigger } from '../shared/interactivity/triggers';
 import { getOrRegisterUrlVariable } from '../shared/interactivity/url-variable';
@@ -13,7 +14,7 @@ const ResetVariables = (ctx, actionImpl) => {
         if (isDerivedVariable(variable) || isDerivedDataVariable(variable)) {
             const triggerAtom = getOrRegisterTrigger(variable);
             ctx.set(triggerAtom, (triggerIndexValue) => ({
-                force: true,
+                force_key: nanoid(),
                 inc: triggerIndexValue.inc + 1,
             }));
         }

package/dist/actions/reset-variables.js.map

@@ -1 +1 @@
-{"version":3,"file":"reset-variables.js","sourceRoot":"","sources":["../../js/actions/reset-variables.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAA+C,MAAM,cAAc,CAAC;AAC3E,OAAO,EACH,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,UAAU,GACb,MAAM,eAAe,CAAC;AAEvB;;;GAGG;AACH,MAAM,cAAc,GAAsC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;IAC1E,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACzD,uCAAuC;QACvC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjE,MAAM,WAAW,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;YAEnD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;gBACzC,KAAK,EAAE,IAAI;gBACX,GAAG,EAAE,iBAAiB,CAAC,GAAG,GAAG,CAAC;aACjC,CAAC,CAAC,CAAC;QACR,CAAC;aAAM,IAAI,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjC,4GAA4G;YAC5G,MAAM,OAAO,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;YACnD,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;YAEnC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QACvF,CAAC;aAAM,IAAI,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClC,oCAAoC;QACxC,CAAC;aAAM,IAAI,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpC,gCAAgC;QACpC,CAAC;aAAM,CAAC;YACJ,mDAAmD;YACnD,MAAM,SAAS,GAAG,0BAA0B,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;YAC9F,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAErB,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QACzF,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"reset-variables.js","sourceRoot":"","sources":["../../js/actions/reset-variables.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAA+C,MAAM,cAAc,CAAC;AAC3E,OAAO,EACH,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,UAAU,GACb,MAAM,eAAe,CAAC;AAEvB;;;GAGG;AACH,MAAM,cAAc,GAAsC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;IAC1E,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACzD,uCAAuC;QACvC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjE,MAAM,WAAW,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;YAEnD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;gBACzC,SAAS,EAAE,MAAM,EAAE;gBACnB,GAAG,EAAE,iBAAiB,CAAC,GAAG,GAAG,CAAC;aACjC,CAAC,CAAC,CAAC;QACR,CAAC;aAAM,IAAI,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjC,4GAA4G;YAC5G,MAAM,OAAO,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;YACnD,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;YAEnC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QACvF,CAAC;aAAM,IAAI,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClC,oCAAoC;QACxC,CAAC;aAAM,IAAI,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpC,gCAAgC;QACpC,CAAC;aAAM,CAAC;YACJ,mDAAmD;YACnD,MAAM,SAAS,GAAG,0BAA0B,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;YAC9F,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAErB,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QACzF,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/dist/actions/trigger-variable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trigger-variable.d.ts","sourceRoot":"","sources":["../../js/actions/trigger-variable.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAE5E;;;GAGG;AACH,QAAA,MAAM,eAAe,EAAE,aAAa,CAAC,mBAAmB,CAOvD,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"trigger-variable.d.ts","sourceRoot":"","sources":["../../js/actions/trigger-variable.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAE5E;;;GAGG;AACH,QAAA,MAAM,eAAe,EAAE,aAAa,CAAC,mBAAmB,CAOvD,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/dist/actions/trigger-variable.js

@@ -1,3 +1,4 @@
+import { nanoid } from 'nanoid';
 import { getOrRegisterTrigger } from '../shared/interactivity/triggers';
 import {} from '../types/core';
 /**
@@ -7,8 +8,8 @@ import {} from '../types/core';
 const TriggerVariable = (ctx, actionImpl) => {
     const triggerAtom = getOrRegisterTrigger(actionImpl.variable);
     ctx.set(triggerAtom, (triggerIndexValue) => ({
-        force: actionImpl.force,
         inc: triggerIndexValue.inc + 1,
+        force_key: actionImpl.force ? nanoid() : null,
     }));
 };
 export default TriggerVariable;

package/dist/actions/trigger-variable.js.map

@@ -1 +1 @@
-{"version":3,"file":"trigger-variable.js","sourceRoot":"","sources":["../../js/actions/trigger-variable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAgD,MAAM,cAAc,CAAC;AAE5E;;;GAGG;AACH,MAAM,eAAe,GAAuC,CAAC,GAAG,EAAE,UAAU,EAAQ,EAAE;IAClF,MAAM,WAAW,GAAG,oBAAoB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAE9D,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;QACzC,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,GAAG,EAAE,iBAAiB,CAAC,GAAG,GAAG,CAAC;KACjC,CAAC,CAAC,CAAC;AACR,CAAC,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"trigger-variable.js","sourceRoot":"","sources":["../../js/actions/trigger-variable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAgD,MAAM,cAAc,CAAC;AAE5E;;;GAGG;AACH,MAAM,eAAe,GAAuC,CAAC,GAAG,EAAE,UAAU,EAAQ,EAAE;IAClF,MAAM,WAAW,GAAG,oBAAoB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAE9D,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;QACzC,GAAG,EAAE,iBAAiB,CAAC,GAAG,GAAG,CAAC;QAC9B,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI;KAChD,CAAC,CAAC,CAAC;AACR,CAAC,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/dist/shared/interactivity/derived-variable.d.ts

@@ -16,7 +16,7 @@ interface DerivedVariableTaskResponse {
 interface FetchDerivedVariableArgs {
     cache: DerivedVariable['cache'];
     extras: RequestExtras;
-    force: boolean;
+    force_key?: string | null;
     is_data_variable?: boolean;
     /**
      * selector instance key  - each selector's requests should be treated separately
@@ -34,13 +34,12 @@ interface FetchDerivedVariableArgs {
  *
  * @param input Function inputs
  * - `cache`, the cache option for the derived variable.
- * - `force`, send force=true in the request body
  * - `extras`, request extras to be merged into the options
  * - `uid`, the uid of the derived variable
  * - `values`, values to pass in the request
  * - `wsClient`, websocket client
  */
-export declare function fetchDerivedVariable<T>({ cache, force, extras, variableUid, values, wsClient, is_data_variable, }: FetchDerivedVariableArgs): Promise<DerivedVariableResponse<T>>;
+export declare function fetchDerivedVariable<T>({ cache, extras, force_key, variableUid, values, wsClient, is_data_variable, }: FetchDerivedVariableArgs): Promise<DerivedVariableResponse<T>>;
 /**
  * Recursively build a deps array from a list of values
  * Values not in deps array are replaced with empty array
@@ -76,17 +75,17 @@ interface PreviousResult {
  * and should be refetched.
  */
 interface CurrentResult {
-    /**
-     * Whether the refetch should be forcing
-     */
-    force: boolean;
     /**
      * List of new 'relevant' values which should be used to update the depsRegistry entry if refetch was successful
      */
     relevantValues: any[];
+    /**
+     * Force key for self-trigger (polling, manual trigger), null if triggered by nested variable
+     */
+    selfTriggerForceKey: string | null;
     type: 'current';
     /**
-     * List of values to use in the refetch request
+     * List of values to use in the refetch request (force_key is now embedded directly in the values)
      */
     values: any[];
 }
@@ -113,7 +112,7 @@ type DerivedResult = PreviousResult | CurrentResult;
  */
 export declare function resolveDerivedValue(key: string, variables: any[], // variable or primitive
 deps: any[], // variable or primitive
-resolvedVariables: any[], wsClient: WebSocketClientInterface, get: GetRecoilValue, selfTrigger?: TriggerIndexValue): Promise<DerivedResult>;
+resolvedVariables: any[], wsClient: WebSocketClientInterface, get: GetRecoilValue, selfTrigger?: TriggerIndexValue): DerivedResult;
 /**
  * Get a derived variable from the selector registry, registering it if not already registered
  *

package/dist/shared/interactivity/derived-variable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derived-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"AAIA,OAAO,EACH,KAAK,cAAc,EACnB,KAAK,WAAW,EAKnB,MAAM,QAAQ,CAAC;AAMhB,OAAO,EAAE,KAAK,wBAAwB,EAA4B,MAAM,OAAO,CAAC;AAChF,OAAO,EAAE,KAAK,aAAa,EAA6B,MAAM,YAAY,CAAC;AAK3E,OAAO,EACH,KAAK,mBAAmB,EACxB,KAAK,eAAe,EACpB,KAAK,iBAAiB,EAGtB,KAAK,uBAAuB,EAU/B,MAAM,SAAS,CAAC;AAIjB,OAAO,EACH,KAAK,iBAAiB,EAKzB,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,4BAA4B,CAAC,CAAC;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,CAAC,CAAC;CACZ;AAED,KAAK,uBAAuB,CAAC,CAAC,IAAI,2BAA2B,GAAG,4BAA4B,CAAC,CAAC,CAAC,CAAC;AAEhG,wBAAgB,cAAc,CAAC,UAAU,EAAE,uBAAuB,CAAC,GAAG,CAAC,GAAG,UAAU,IAAI,2BAA2B,CAElH;AAED,UAAU,2BAA2B;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,wBAAwB;IAC9B,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IAChC,MAAM,EAAE,aAAa,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,wBAAwB,CAAC;CACtC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CAAC,CAAC,EAAE,EAC1C,KAAK,EACL,KAAK,EACL,MAAM,EACN,WAAW,EACX,MAAM,EACN,QAAQ,EACR,gBAAwB,GAC3B,EAAE,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAqBhE;AAwGD;;;;;;GAMG;AAEH,wBAAgB,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,uBAAuB,GAAG,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,GAAG,EAAE,CAiB5F;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,eAAe,GAAG,iBAAiB,CAE5E;AAED;;;GAGG;AACH,UAAU,cAAc;IACpB;;OAEG;IACH,KAAK,EAAE;QACH,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;QACxB,MAAM,EAAE,GAAG,CAAC;KACf,CAAC;IACF,IAAI,EAAE,UAAU,CAAC;CACpB;AAED;;;GAGG;AACH,UAAU,aAAa;IACnB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,cAAc,EAAE,GAAG,EAAE,CAAC;IACtB,IAAI,EAAE,SAAS,CAAC;IAChB;;OAEG;IACH,MAAM,EAAE,GAAG,EAAE,CAAC;CACjB;AAED;;GAEG;AACH,KAAK,aAAa,GAAG,cAAc,GAAG,aAAa,CAAC;AAEpD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,mBAAmB,CACrC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,GAAG,EAAE,EAAE,wBAAwB;AAC1C,IAAI,EAAE,GAAG,EAAE,EAAE,wBAAwB;AACrC,iBAAiB,EAAE,GAAG,EAAE,EACxB,QAAQ,EAAE,wBAAwB,EAClC,GAAG,EAAE,cAAc,EACnB,WAAW,CAAC,EAAE,iBAAiB,GAChC,OAAO,CAAC,aAAa,CAAC,CAwGxB;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CACxC,QAAQ,EAAE,eAAe,GAAG,mBAAmB,EAC/C,QAAQ,EAAE,wBAAwB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,aAAa,GAC7B,WAAW,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC,CAwJhD;AAED;;;;;;;;;GASG;AACH,wBAAgB,iCAAiC,CAC7C,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,wBAAwB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,aAAa,GAC7B,WAAW,CAAC,GAAG,CAAC,CAyClB;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAC9B,QAAQ,EAAE,eAAe,GAAG,mBAAmB,EAC/C,QAAQ,EAAE,wBAAwB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,MAAM,EAAE,aAAa,GACtB,WAAW,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC,CAqBhD"}
+{"version":3,"file":"derived-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"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"}

package/dist/shared/interactivity/derived-variable.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 /* eslint-disable react-hooks/exhaustive-deps */
 import isEqual from 'lodash/isEqual';
+import set from 'lodash/set';
 import { nanoid } from 'nanoid';
 import { useCallback, useMemo } from 'react';
 import { isRecoilValue, selectorFamily, useRecoilValue, useSetRecoilState, } from 'recoil';
@@ -23,8 +24,9 @@ import { normalizeRequest } from '../../shared/utils/normalization';
 import useInterval from '../../shared/utils/use-interval';
 import { isCondition, isDerivedDataVariable, isDerivedVariable, isResolvedDataVariable, isResolvedDerivedDataVariable, isResolvedDerivedVariable, isResolvedSwitchVariable, isVariable, } from '../../types';
 // eslint-disable-next-line import/no-cycle
-import { cleanArgs, getOrRegisterTrigger, registerChildTriggers, resolveNested, resolveVariable } from './internal';
+import { cleanArgs, getOrRegisterTrigger, resolveNested, resolveVariable } from './internal';
 import { depsRegistry, getRegistryKey, selectorFamilyMembersRegistry, selectorFamilyRegistry, } from './store';
+import { buildTriggerList, registerChildTriggers } from './triggers';
 export function isTaskResponse(dvResponse) {
     return 'task_id' in dvResponse;
 }
@@ -33,14 +35,13 @@ export function isTaskResponse(dvResponse) {
  *
  * @param input Function inputs
  * - `cache`, the cache option for the derived variable.
- * - `force`, send force=true in the request body
  * - `extras`, request extras to be merged into the options
  * - `uid`, the uid of the derived variable
  * - `values`, values to pass in the request
  * - `wsClient`, websocket client
  */
 export function fetchDerivedVariable(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ cache, force, extras, variableUid, values, wsClient, is_data_variable = false, }) {
+    return __awaiter(this, arguments, void 0, function* ({ cache, extras, force_key, variableUid, values, wsClient, is_data_variable = false, }) {
         const cacheControl = cache === null ?
             {
                 'cache-control': 'none',
@@ -48,7 +49,7 @@ export function fetchDerivedVariable(_a) {
             : undefined;
         const ws_channel = yield wsClient.getChannel();
         const res = yield request(`/api/core/derived-variable/${variableUid}`, {
-            body: JSON.stringify({ force, is_data_variable, values, ws_channel }),
+            body: JSON.stringify({ is_data_variable, values, ws_channel, force_key: force_key !== null && force_key !== void 0 ? force_key : null }),
             headers: Object.assign({}, cacheControl),
             method: HTTP_METHOD.POST,
         }, extras);
@@ -65,7 +66,7 @@ export function fetchDerivedVariable(_a) {
 const debouncedFetchSubjects = {};
 const debouncedFetchCache = {};
 function debouncedFetchDerivedVariable(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ variableUid, selectorKey, values, wsClient, force, extras, cache, is_data_variable = false, }) {
+    return __awaiter(this, arguments, void 0, function* ({ variableUid, selectorKey, values, wsClient, extras, cache, force_key, is_data_variable = false, }) {
         // If this is the first time this is called then set up a subject and return stream for this selector
         if (!debouncedFetchSubjects[selectorKey]) {
             debouncedFetchSubjects[selectorKey] = new BehaviorSubject(null);
@@ -75,7 +76,7 @@ function debouncedFetchDerivedVariable(_a) {
         debouncedFetchSubjects[selectorKey].next({
             cache,
             extras,
-            force,
+            force_key,
             is_data_variable,
             selectorKey,
             values,
@@ -167,93 +168,106 @@ export function useTriggerIndex(variable) {
 export function resolveDerivedValue(key, variables, // variable or primitive
 deps, // variable or primitive
 resolvedVariables, wsClient, get, selfTrigger) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // Register nested triggers as dependencies so triggering one of the nested derived variables will trigger a recalculation here
-        const triggers = registerChildTriggers(variables, wsClient, get);
-        if (selfTrigger) {
-            triggers.unshift(selfTrigger);
+    // Build trigger map once for efficient lookups
+    const triggerList = buildTriggerList(variables);
+    // Register nested triggers as dependencies so triggering one of the nested derived variables will trigger a recalculation here
+    const triggers = registerChildTriggers(triggerList, wsClient, get);
+    if (selfTrigger) {
+        triggers.unshift(selfTrigger);
+    }
+    /**
+     * Array of values:
+     * - primitive values are resolved to themselves
+     * - simple variables are resolved to their values
+     * - derived variables are resolved to ResolvedDerivedVariable objects with nested values/deps resolved to values
+     * - ResolvedDataVariable objects are left as is
+     */
+    const values = resolvedVariables.map((v) => resolveValue(v, get));
+    /**
+     * Array of values with ResolvedDerivedVariable objects replaced
+     * (recursively) by nested arrays of their dependency values
+     *
+     * Dependencies which aren't included in `deps` are replaced with empty arrays
+     */
+    const depsValues = getDeps(values);
+    /**
+     * A map of variable UID-nested -> its primitive value (or array of dependencies).
+     * Only includes variables present in deps
+     *
+     * `nested` is used to generate a key so that the same variable with different nested property will be
+     * present in the map separately.
+     */
+    const variableValueMap = variables.reduce((acc, v, idx) => {
+        // skip non-variables
+        if (!isVariable(v)) {
+            return acc;
         }
-        /**
-         * Array of values:
-         * - primitive values are resolved to themselves
-         * - simple variables are resolved to their values
-         * - derived variables are resolved to ResolvedDerivedVariable objects with nested values/deps resolved to values
-         * - ResolvedDataVariable objects are left as is
-         */
-        const values = resolvedVariables.map((v) => resolveValue(v, get));
-        /**
-         * Array of values with ResolvedDerivedVariable objects replaced
-         * (recursively) by nested arrays of their dependency values
-         *
-         * Dependencies which aren't included in `deps` are replaced with empty arrays
-         */
-        const depsValues = getDeps(values);
-        /**
-         * A map of variable UID-nested -> its primitive value (or array of dependencies).
-         * Only includes variables present in deps
-         *
-         * `nested` is used to generate a key so that the same variable with different nested property will be
-         * present in the map separately.
-         */
-        const variableValueMap = variables.reduce((acc, v, idx) => {
-            // skip non-variables
-            if (!isVariable(v)) {
-                return acc;
-            }
-            return acc.set(getUniqueIdentifier(v), depsValues[idx]);
-        }, new Map());
-        let recalculateForced = false; // whether the recalculation was forced or not (by calling trigger with force=true)
-        let wasTriggered = false; // whether a trigger caused the selector execution
-        let wasTriggeredItself = false; // whether the variable's own trigger caused the selector execution
-        /**
-         * Deps handling
-         */
-        const previousEntry = depsRegistry.get(key);
-        // Get relevant values based on deps
-        const relevantValues = deps
-            .filter(isVariable)
-            .map((dep) => variableValueMap.get(getUniqueIdentifier(dep)))
-            .concat(triggers.map((trigger) => trigger.inc)); // Append triggerValues to make triggers force a recalc even when deps didn't change
-        // If there's no entry it's the first run so skip; otherwise:
-        if (previousEntry) {
-            const areArgsTheSame = isEqual(previousEntry.args, relevantValues);
-            // If the relevant arg values didn't change, return previous result
-            if (areArgsTheSame) {
-                return {
-                    entry: previousEntry,
-                    type: 'previous',
-                };
-            }
-            // Otherwise continue and fetch new value, but first check what caused the change
-            // Assumption: Triggers are always stored after the values, with the triggers of the current variable being first
-            const previousTriggerCounters = previousEntry.args.slice(previousEntry.args.length - triggers.length);
-            for (const [idx, triggerValue] of triggers.entries()) {
-                /**
-                 *  If any of the nested trigger value has changed (this execution was caused by a trigger)
-                 *  update whether it was called with a `force` flag or not - based on the trigger that changed
-                 */
-                if (triggerValue.inc !== previousTriggerCounters[idx]) {
-                    recalculateForced = triggerValue.force;
-                    // Record whether its own trigger was the one that caused the change
-                    if (idx === 0) {
-                        wasTriggeredItself = true;
+        return acc.set(getUniqueIdentifier(v), depsValues[idx]);
+    }, new Map());
+    /**
+     * Deps handling
+     */
+    const previousEntry = depsRegistry.get(key);
+    // Get relevant values based on deps
+    const relevantValues = deps
+        .filter(isVariable)
+        .map((dep) => variableValueMap.get(getUniqueIdentifier(dep)))
+        .concat(triggers.map((trigger) => trigger.inc)); // Append triggerValues to make triggers force a recalc even when deps didn't change
+    // If there's no entry it's the first run so skip; otherwise:
+    if (previousEntry) {
+        const areArgsTheSame = isEqual(previousEntry.args, relevantValues);
+        // If the relevant arg values didn't change, return previous result
+        if (areArgsTheSame) {
+            return {
+                entry: previousEntry,
+                type: 'previous',
+            };
+        }
+        // Otherwise continue and fetch new value, but first check what caused the change
+        // Assumption: Triggers are always stored after the values, with the triggers of the current variable being first
+        const previousTriggerCounters = previousEntry.args.slice(previousEntry.args.length - triggers.length);
+        // Find which trigger changed and handle force_key appropriately
+        let selfTriggerForceKey = null;
+        for (const [idx, triggerValue] of triggers.entries()) {
+            /**
+             *  If any of the nested trigger value has changed (this execution was caused by a trigger)
+             *  handle the force_key appropriately
+             */
+            if (triggerValue.inc !== previousTriggerCounters[idx]) {
+                if (selfTrigger && idx === 0) {
+                    // This is a self-trigger (polling, manual trigger) - use global force
+                    selfTriggerForceKey = triggerValue.force_key;
+                }
+                else if (triggerValue.force_key) {
+                    // This is a nested variable trigger - embed force_key in the specific variable
+                    // shift index back by 1 if we prepended a self trigger
+                    const valueIndex = selfTrigger ? idx - 1 : idx;
+                    const triggerInfo = triggerList[valueIndex];
+                    // If the trigger path is empty, it means we need to force the DV itself
+                    // This can happen when e.g. a dependant DataVariable is triggered
+                    if (triggerInfo.path.length === 0) {
+                        selfTriggerForceKey = triggerValue.force_key;
+                    }
+                    else {
+                        set(values, [...triggerInfo.path, 'force_key'], triggerValue.force_key);
                     }
-                    wasTriggered = true;
-                    break;
                 }
+                break;
             }
         }
-        // if it was triggered but not by its own trigger, wait 50ms to let the triggered variable run first
-        if (wasTriggered && !wasTriggeredItself) {
-            yield new Promise((resolve) => setTimeout(resolve, 50));
-        }
         return {
-            force: recalculateForced,
             relevantValues,
+            selfTriggerForceKey,
             type: 'current',
             values,
         };
-    });
+    }
+    return {
+        relevantValues,
+        selfTriggerForceKey: null,
+        type: 'current',
+        values,
+    };
 }
 /**
  * Get a derived variable from the selector registry, registering it if not already registered
@@ -291,7 +305,7 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, cu
                 const { extras } = extrasSerializable;
                 // for deps use a different key for each selector instance rather than one per family
                 const selectorKey = key + extrasSerializable.toJSON();
-                const derivedResult = yield resolveDerivedValue(selectorKey, variable.variables, variable.deps, resolvedVariables, wsClient, get, selfTrigger);
+                const derivedResult = resolveDerivedValue(selectorKey, variable.variables, variable.deps, resolvedVariables, wsClient, get, selfTrigger);
                 if (derivedResult.type === 'previous') {
                     return { cache_key: derivedResult.entry.cacheKey, value: derivedResult.entry.result };
                 }
@@ -300,10 +314,10 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, cu
                     variableResponse = yield debouncedFetchDerivedVariable({
                         cache: variable.cache,
                         extras,
-                        force: derivedResult.force,
+                        force_key: derivedResult.selfTriggerForceKey,
                         is_data_variable: isDerivedDataVariable(variable),
                         selectorKey,
-                        values: normalizeRequest(cleanArgs(derivedResult.values, false), variable.variables),
+                        values: normalizeRequest(cleanArgs(derivedResult.values), variable.variables),
                         variableUid: variable.uid,
                         wsClient,
                     });
@@ -442,7 +456,10 @@ export function useDerivedVariable(variable, WsClient, taskContext, extras) {
     const triggerIndex = useMemo(() => getOrRegisterTrigger(variable), []);
     // Creating a setter function for triggerIndex
     const triggerUpdates = useSetRecoilState(triggerIndex);
-    const trigger = useCallback((force = true) => triggerUpdates((val) => ({ force, inc: val.inc + 1 })), [triggerUpdates]);
+    const trigger = useCallback((force = true) => triggerUpdates((val) => ({
+        force_key: force ? nanoid() : null,
+        inc: val.inc + 1,
+    })), [triggerUpdates]);
     // Using useInterval to poll, forcing recalculation everytime
     useInterval(trigger, variable.polling_interval);
     return dvSelector;

package/dist/shared/interactivity/derived-variable.js.map

@@ -1 +1 @@
-{"version":3,"file":"derived-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"derived-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"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"}

package/dist/shared/interactivity/resolve-variable.d.ts

@@ -15,23 +15,27 @@ import { type AnyVariable, type GlobalTaskContext, type ResolvedDataVariable, ty
  */
 export declare function resolveVariable<VariableType>(variable: AnyVariable<VariableType>, client: WebSocketClientInterface, taskContext: GlobalTaskContext, extras: RequestExtras, resolver?: (val: RecoilState<VariableType>) => RecoilState<VariableType> | ResolvedDerivedVariable | VariableType): RecoilState<VariableType> | ResolvedDerivedVariable | ResolvedDerivedDataVariable | ResolvedDataVariable | ResolvedSwitchVariable | VariableType;
 /**
- * Claan value to a format understood by the backend.
- * Removes `deps`, appends `force` to resolved derived(data)variables.
+ * Clean value to a format understood by the backend.
+ * Removes `deps`, preserves embedded `force_key` from resolved derived(data)variables.
  *
  * @param value a value to clean
- * @param force whether to force a derived variable recalculation
+ * @param forceKeyOverride optional force key to use instead of the one embedded in the resolved variable
  */
-export declare function cleanValue(value: unknown, force: boolean): any;
+export declare function cleanValue(value: unknown, forceKeyOverride?: string | null): any;
 /**
- * Claan kwargs to a format understood by the backend.
- * Removes `deps`, appends `force` to resolved derived(data)variables.
+ * Clean kwargs to a format understood by the backend.
+ * Removes `deps`, preserves embedded `force_key` from resolved derived(data)variables.
+ *
+ * @param kwargs kwargs to clean
+ * @param forceKeyOverride optional force key to use instead of the one embedded in the resolved variable
  */
-export declare function cleanKwargs(kwargs: Record<string, any>, force: boolean): Record<string, any>;
+export declare function cleanKwargs(kwargs: Record<string, any>, forceKeyOverride?: string | null): Record<string, any>;
 /**
  * Format values into a shape expected by the backend.
- * Removes `deps`, appends `force` to resolved derived(data)variables.
+ * Removes `deps`, preserves embedded `force_key` from resolved derived(data)variables.
  *
  * @param values list of values - plain values or ResolvedDerivedVariable constructs with plain values nested inside
+ * @param forceKeyOverride optional force key to use instead of the one embedded in the resolved variable
  */
-export declare function cleanArgs(values: Array<any | ResolvedDerivedVariable>, force: boolean): any[];
+export declare function cleanArgs(values: Array<any | ResolvedDerivedVariable>, forceKeyOverride?: string | null): any[];
 //# sourceMappingURL=resolve-variable.d.ts.map

package/dist/shared/interactivity/resolve-variable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/resolve-variable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EACH,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EACzB,KAAK,2BAA2B,EAChC,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,EAW9B,MAAM,SAAS,CAAC;AAUjB;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,YAAY,EACxC,QAAQ,EAAE,WAAW,CAAC,YAAY,CAAC,EACnC,MAAM,EAAE,wBAAwB,EAChC,WAAW,EAAE,iBAAiB,EAC9B,MAAM,EAAE,aAAa,EACrB,QAAQ,GAAE,CAAC,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC,KAAK,WAAW,CAAC,YAAY,CAAC,GAAG,uBAAuB,GAAG,YAE5F,GAEN,WAAW,CAAC,YAAY,CAAC,GACzB,uBAAuB,GACvB,2BAA2B,GAC3B,oBAAoB,GACpB,sBAAsB,GACtB,YAAY,CAuEjB;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,GAAG,CAsB9D;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAQ5F;AAED;;;;;GAKG;AAEH,wBAAgB,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,GAAG,uBAAuB,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,GAAG,EAAE,CAE7F"}
+{"version":3,"file":"resolve-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/resolve-variable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EACH,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EACzB,KAAK,2BAA2B,EAChC,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,EAW9B,MAAM,SAAS,CAAC;AAUjB;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,YAAY,EACxC,QAAQ,EAAE,WAAW,CAAC,YAAY,CAAC,EACnC,MAAM,EAAE,wBAAwB,EAChC,WAAW,EAAE,iBAAiB,EAC9B,MAAM,EAAE,aAAa,EACrB,QAAQ,GAAE,CAAC,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC,KAAK,WAAW,CAAC,YAAY,CAAC,GAAG,uBAAuB,GAAG,YAE5F,GAEN,WAAW,CAAC,YAAY,CAAC,GACzB,uBAAuB,GACvB,2BAA2B,GAC3B,oBAAoB,GACpB,sBAAsB,GACtB,YAAY,CAuEjB;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,GAAG,CAuBhF;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAQ9G;AAED;;;;;;GAMG;AAEH,wBAAgB,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,GAAG,uBAAuB,CAAC,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,GAAG,EAAE,CAE/G"}

package/dist/shared/interactivity/resolve-variable.js

@@ -82,41 +82,47 @@ export function resolveVariable(variable, client, taskContext, extras, resolver
     return resolver(getOrRegisterPlainVariable(variable, client, taskContext, extras));
 }
 /**
- * Claan value to a format understood by the backend.
- * Removes `deps`, appends `force` to resolved derived(data)variables.
+ * Clean value to a format understood by the backend.
+ * Removes `deps`, preserves embedded `force_key` from resolved derived(data)variables.
  *
  * @param value a value to clean
- * @param force whether to force a derived variable recalculation
+ * @param forceKeyOverride optional force key to use instead of the one embedded in the resolved variable
  */
-export function cleanValue(value, force) {
+export function cleanValue(value, forceKeyOverride) {
     if (isResolvedDerivedVariable(value) || isResolvedDerivedDataVariable(value)) {
         const { deps } = value, rest = __rest(value, ["deps"]);
-        const cleanedValues = value.values.map((v) => cleanValue(v, force));
-        return Object.assign(Object.assign({}, rest), { force, values: cleanedValues });
+        const cleanedValues = value.values.map((v) => cleanValue(v));
+        return Object.assign(Object.assign({}, rest), { 
+            // Use override if provided, otherwise use the embedded force_key from the resolved variable
+            force_key: forceKeyOverride !== null && forceKeyOverride !== void 0 ? forceKeyOverride : (value.force_key || null), values: cleanedValues });
     }
     if (isResolvedSwitchVariable(value)) {
-        return Object.assign(Object.assign({}, value), { value: cleanValue(value.value, force), value_map: cleanValue(value.value_map, force), default: cleanValue(value.default, force) });
+        return Object.assign(Object.assign({}, value), { value: cleanValue(value.value, forceKeyOverride), value_map: cleanValue(value.value_map, forceKeyOverride), default: cleanValue(value.default, forceKeyOverride) });
     }
     return value;
 }
 /**
- * Claan kwargs to a format understood by the backend.
- * Removes `deps`, appends `force` to resolved derived(data)variables.
+ * Clean kwargs to a format understood by the backend.
+ * Removes `deps`, preserves embedded `force_key` from resolved derived(data)variables.
+ *
+ * @param kwargs kwargs to clean
+ * @param forceKeyOverride optional force key to use instead of the one embedded in the resolved variable
  */
-export function cleanKwargs(kwargs, force) {
+export function cleanKwargs(kwargs, forceKeyOverride) {
     return Object.keys(kwargs).reduce((acc, k) => {
-        acc[k] = cleanValue(kwargs[k], force);
+        acc[k] = cleanValue(kwargs[k], forceKeyOverride);
         return acc;
     }, {});
 }
 /**
  * Format values into a shape expected by the backend.
- * Removes `deps`, appends `force` to resolved derived(data)variables.
+ * Removes `deps`, preserves embedded `force_key` from resolved derived(data)variables.
  *
  * @param values list of values - plain values or ResolvedDerivedVariable constructs with plain values nested inside
+ * @param forceKeyOverride optional force key to use instead of the one embedded in the resolved variable
  */
 // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-export function cleanArgs(values, force) {
-    return values.map((val) => cleanValue(val, force));
+export function cleanArgs(values, forceKeyOverride) {
+    return values.map((val) => cleanValue(val, forceKeyOverride));
 }
 //# sourceMappingURL=resolve-variable.js.map

package/dist/shared/interactivity/resolve-variable.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/resolve-variable.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolve-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/resolve-variable.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAoB,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAiC,MAAM,OAAO,CAAC;AACtD,OAAO,EAAsB,MAAM,YAAY,CAAC;AAChD,OAAO,EAOH,WAAW,EACX,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,6BAA6B,EAC7B,yBAAyB,EACzB,wBAAwB,EACxB,gBAAgB,EAChB,aAAa,EACb,UAAU,GACb,MAAM,SAAS,CAAC;AAEjB,2CAA2C;AAC3C,OAAO,EACH,4BAA4B,EAC5B,0BAA0B,EAC1B,wBAAwB,EACxB,mBAAmB,GACtB,MAAM,YAAY,CAAC;AAEpB;;;;;;;;;;GAUG;AACH,MAAM,UAAU,eAAe,CAC3B,QAAmC,EACnC,MAAgC,EAChC,WAA8B,EAC9B,MAAqB,EACrB,WAAmH,CAC/G,GAA8B,EAChC,EAAE,CAAC,GAAG;IAQR,IAAI,iBAAiB,CAAC,QAAQ,CAAC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjE,4BAA4B,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAEpE,6DAA6D;QAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;QAExG,4CAA4C;QAC5C,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAEhG,IAAI,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClC,OAAO;gBACH,IAAI;gBACJ,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,IAAI,EAAE,cAAc;gBACpB,GAAG,EAAE,QAAQ,CAAC,GAAG;gBACjB,MAAM;aAC6B,CAAC;QAC5C,CAAC;QAED,OAAO;YACH,IAAI;YACJ,IAAI,EAAE,SAAS;YACf,GAAG,EAAE,QAAQ,CAAC,GAAG;YACjB,MAAM;SACyB,CAAC;IACxC,CAAC;IAED,IAAI,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3B,OAAO,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,OAAO,QAAQ,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,iEAAiE;QACjE,sEAAsE;QACtE,IAAI,aAAa,GACb,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;YACxB,eAAe,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC;YAC1E,CAAC,CAAG,QAAQ,CAAC,KAAK,CAAC;QAEvB,0DAA0D;QAC1D,IAAI,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC;YAC7B,aAAa,mCACN,aAAa,KAChB,QAAQ,EAAE,eAAe,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAQ,GAClG,CAAC;QACN,CAAC;QAED,MAAM,gBAAgB,GAClB,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;YAC5B,eAAe,CAAC,QAAQ,CAAC,SAAgB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC;YACrF,CAAC,CAAG,QAAQ,CAAC,SAAS,CAAC;QAC3B,MAAM,eAAe,GACjB,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YAC1B,eAAe,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC;YAC5E,CAAC,CAAG,QAAQ,CAAC,OAAO,CAAC;QAEzB,OAAO;YACH,IAAI,EAAE,QAAQ;YACd,GAAG,EAAE,QAAQ,CAAC,GAAG;YACjB,KAAK,EAAE,aAAa;YACpB,SAAS,EAAE,gBAAgB;YAC3B,OAAO,EAAE,eAAe;SACM,CAAC;IACvC,CAAC;IAED,OAAO,QAAQ,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;AACvF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,UAAU,CAAC,KAAc,EAAE,gBAAgC;IACvE,IAAI,yBAAyB,CAAC,KAAK,CAAC,IAAI,6BAA6B,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3E,MAAM,EAAE,IAAI,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAAzB,QAAiB,CAAQ,CAAC;QAChC,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAE7D,uCACO,IAAI;YACP,4FAA4F;YAC5F,SAAS,EAAE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,EACxD,MAAM,EAAE,aAAa,IACvB;IACN,CAAC;IAED,IAAI,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC;QAClC,uCACO,KAAK,KACR,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,gBAAgB,CAAC,EAChD,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,EACxD,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,gBAAgB,CAAC,IACtD;IACN,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,WAAW,CAAC,MAA2B,EAAE,gBAAgC;IACrF,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAC7B,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QACP,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;QACjD,OAAO,GAAG,CAAC;IACf,CAAC,EACD,EAAyB,CAC5B,CAAC;AACN,CAAC;AAED;;;;;;GAMG;AACH,6EAA6E;AAC7E,MAAM,UAAU,SAAS,CAAC,MAA4C,EAAE,gBAAgC;IACpG,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC,CAAC;AAClE,CAAC"}

package/dist/shared/interactivity/store.d.ts

@@ -50,7 +50,8 @@ export declare const depsRegistry: Map<string, {
     result: any;
 }>;
 export type TriggerIndexValue = {
-    force: boolean;
+    /** Set to a unique key if force=True was set by the user */
+    force_key: string | null;
     inc: number;
 };
 type RegistryKeyType = 'selector' | 'derived-selector' | 'trigger' | 'filters';