npm - @darajs/core - Versions diffs - 1.19.1 → 1.20.0 - Mend

@darajs/core 1.19.1 → 1.20.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (131) hide show

package/dist/components/for/for.d.ts CHANGED Viewed

@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { type AnyVariable, type ComponentInstance } from '../../types/core';
+import { type ComponentInstance, type Variable } from '../../types/core';
 interface VirtualizationConfig {
     size: string | number | null;
     direction: 'vertical' | 'horizontal';
 }
 interface ForProps {
-    items: AnyVariable<Array<any>>;
+    items: Variable<Array<any>>;
     renderer: ComponentInstance;
     placeholder: ComponentInstance | null;
     key_accessor: string | null;

package/dist/components/for/for.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"for.d.ts","sourceRoot":"","sources":["../../../js/components/for/for.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAS/B,OAAO,EAAE,KAAK,~~WAAW~~,EAAE,KAAK,~~iBAAiB~~,EAAE,MAAM,kBAAkB,CAAC;~~AAG5E~~,UAAU,oBAAoB;IAC1B,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,UAAU,GAAG,YAAY,CAAC;CACxC;AAED,UAAU,QAAQ;IACd,KAAK,EAAE,~~WAAW~~,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;~~IAC/B~~,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACtC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,oBAAoB,GAAG,IAAI,CAAC;CAC/C;AAwHD,iBAAS,GAAG,CAAC,KAAK,EAAE,QAAQ,GAAG,KAAK,CAAC,SAAS,CAS7C;AAED,eAAe,GAAG,CAAC"}
1	+ {"version":3,"file":"for.d.ts","sourceRoot":"","sources":["../../../js/components/for/for.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAS/B,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGzE,UAAU,oBAAoB;IAC1B,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,UAAU,GAAG,YAAY,CAAC;CACxC;AAED,UAAU,QAAQ;IACd,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACtC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,oBAAoB,GAAG,IAAI,CAAC;CAC/C;AAwHD,iBAAS,GAAG,CAAC,KAAK,EAAE,QAAQ,GAAG,KAAK,CAAC,SAAS,CAS7C;AAED,eAAe,GAAG,CAAC"}

package/dist/components/for/for.js CHANGED Viewed

@@ -4,7 +4,7 @@ import isEqual from 'lodash/isEqual';
 import * as React from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { VariableSizeList } from 'react-window';
-import { DynamicComponent, useAnyVariable } from '../../shared';
+import { DynamicComponent, useVariable } from '../../shared';
 import { FallbackCtx } from '../../shared/context';
 import { useFallbackCtx } from '../../shared/context/fallback-context';
 import { resolveNested } from '../../shared/interactivity/nested';
@@ -38,7 +38,7 @@ const ForChild = React.memo((props) => {
     return _jsx(DynamicComponent, { component: transformedRenderer });
 }, isEqual);
 function ForImpl(props) {
-    const items = useAnyVariable(props.items);
+    const [items] = useVariable(props.items, { suspend: false });
     const markers = React.useMemo(() => getInjectionMarkers(props.renderer), [props.renderer]);
     const key = React.useMemo(() => { var _a, _b; return (_b = (_a = props.key_accessor) === null || _a === void 0 ? void 0 : _a.split('.')) !== null && _b !== void 0 ? _b : null; }, [props.key_accessor]);
     const getItemKey = React.useCallback((index, data) => (key ? resolveNested(data.items[index], key) : index), [key]);

package/dist/components/for/for.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"for.js","sourceRoot":"","sources":["../../../js/components/for/for.tsx"],"names":[],"mappings":";AAAA,OAAO,IAAI,MAAM,kBAAkB,CAAC;AACpC,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,SAAS,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAA0D,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAExG,OAAO,EAAE,gBAAgB,EAAE,~~cAAc~~,EAAE,MAAM,UAAU,CAAC;~~AAC5D~~,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,~~EAA4C~~,MAAM,kBAAkB,CAAC;~~AAC5E~~,OAAO,EAAe,YAAY,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAyB9E,MAAM,cAAc,GAAG,CACnB,KAAY,EACZ,QAA2B,EAC3B,OAAiB,EACjB,UAAyC,EACjC,EAAE,CAAC,CAAC;IACZ,KAAK;IACL,QAAQ;IACR,OAAO;IACP,UAAU;CACb,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,KAAwC,EAAmB,EAAE;IACtF,MAAM,mBAAmB,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAC3C,IAAI,SAAS,CAAC;QAEd,IAAI,CAAC;YACD,SAAS,GAAG,YAAY,CACpB,KAAK,CAAC,IAAI,CAAC,QAAQ,EACnB,KAAK,CAAC,IAAI,CAAC,OAAO,EAClB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,EAC7B,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CACjD,CAAC;QACN,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC;YAC5C,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;QAED,qGAAqG;QACrG,SAAS,CAAC,KAAK,CAAC,KAAK,mCAAQ,SAAS,CAAC,KAAK,CAAC,KAAK,GAAK,KAAK,CAAC,KAAK,CAAE,CAAC;QACrE,OAAO,SAAS,CAAC;IACrB,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3C,OAAO,KAAC,gBAAgB,IAAC,SAAS,EAAE,mBAAmB,GAAI,CAAC;AAChE,CAAC,EAAE,OAAO,CAAC,CAAC;AAEZ,SAAS,OAAO,CAAC,KAA+C;IAC5D,MAAM,KAAK,GAAG,~~cAAc~~,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;~~IAC1C~~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"}
1	+ {"version":3,"file":"for.js","sourceRoot":"","sources":["../../../js/components/for/for.tsx"],"names":[],"mappings":"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"}

package/dist/components/progress-tracker/progress-tracker.js CHANGED Viewed

@@ -122,9 +122,9 @@ function ProgressTracker(props) {
             // can be tracked; this is only an issue if a component calls useVariable for multiple inputs
             if (taskIds.length > 0) {
                 setSubscribedTaskIds(taskIds);
-                progressSubscription = wsClient
-                    .progressUpdates$(...taskIds)
-                    .subscribe((notif) => setLatestProgressUpdate(notif.message));
+                progressSubscription = wsClient.progressUpdates$(...taskIds).subscribe((notif) => {
+                    setLatestProgressUpdate(notif.message);
+                });
                 clearInterval(timer);
             }
         }, POLLING_INTERVAL);

package/dist/components/progress-tracker/progress-tracker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"progress-tracker.js","sourceRoot":"","sources":["../../../js/components/progress-tracker/progress-tracker.tsx"],"names":[],"mappings":"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~~;qBAC1B~~,gBAAgB,CAAC,GAAG,OAAO,CAAC~~;qBAC5B~~,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,~~CAAC,~~uBAAuB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;~~gBAElE~~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"}
1	+ {"version":3,"file":"progress-tracker.js","sourceRoot":"","sources":["../../../js/components/progress-tracker/progress-tracker.tsx"],"names":[],"mappings":"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"}

package/dist/{dara_core-1.19.1-py3-none-any.whl → dara_core-1.20.0-py3-none-any.whl} RENAMED Viewed

Binary file

package/dist/shared/dynamic-component/dynamic-component.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"dynamic-component.d.ts","sourceRoot":"","sources":["../../../js/shared/dynamic-component/dynamic-component.tsx"],"names":[],"mappings":"AAqBA,OAAO,~~EAEH~~,KAAK,iBAAiB,~~EAKzB~~,MAAM,SAAS,CAAC;~~AA8DjB~~;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAGvC;AAuID,UAAU,qBAAqB;IAC3B,uCAAuC;IACvC,SAAS,EAAE,iBAAiB,GAAG,IAAI,GAAG,SAAS,CAAC;CACnD;AA8BD;;;;;;;GAOG;AACH,iBAAS,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,KAAK,CAAC,SAAS,CAwIvE;;AAkED,wBAAsC"}
1	+ {"version":3,"file":"dynamic-component.d.ts","sourceRoot":"","sources":["../../../js/shared/dynamic-component/dynamic-component.tsx"],"names":[],"mappings":"AAqBA,OAAO,EAAkB,KAAK,iBAAiB,EAA2C,MAAM,SAAS,CAAC;AA8D1G;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAGvC;AAuID,UAAU,qBAAqB;IAC3B,uCAAuC;IACvC,SAAS,EAAE,iBAAiB,GAAG,IAAI,GAAG,SAAS,CAAC;CACnD;AA8BD;;;;;;;GAOG;AACH,iBAAS,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,KAAK,CAAC,SAAS,CAwIvE;;AAkED,wBAAsC"}

package/dist/shared/dynamic-component/dynamic-component.js CHANGED Viewed

@@ -18,7 +18,7 @@ import { ErrorDisplay, isSelectorError } from '../../shared/error-handling';
 import { useRefreshSelector } from '../../shared/interactivity';
 import useServerComponent, { useRefreshServerComponent } from '../../shared/interactivity/use-server-component';
 import { isJsComponent, useComponentRegistry, useInterval } from '../../shared/utils';
-import { isDerivedDataVariable, isDerivedVariable, } from '../../types';
+import { isDerivedVariable } from '../../types';
 import { UserError, isInvalidComponent, isRawString } from '../../types/core';
 import { cleanProps } from './clean-props';
 /**
@@ -33,7 +33,7 @@ function getDerivedVariablePollingInterval(variable) {
         pollingInterval = variable.polling_interval;
     }
     variable.variables.forEach((value) => {
-        if (isDerivedVariable(value) || isDerivedDataVariable(value)) {
+        if (isDerivedVariable(value)) {
             const innerPollingInterval = getDerivedVariablePollingInterval(value);
             if (innerPollingInterval && (!pollingInterval || pollingInterval > innerPollingInterval)) {
                 pollingInterval = innerPollingInterval;
@@ -52,7 +52,7 @@ function getDerivedVariablePollingInterval(variable) {
 function computePollingInterval(kwargs, componentInterval) {
     let pollingInterval;
     Object.values(kwargs).forEach((value) => {
-        if (isDerivedVariable(value) || isDerivedDataVariable(value)) {
+        if (isDerivedVariable(value)) {
             const innerPollingInterval = getDerivedVariablePollingInterval(value);
             if (innerPollingInterval && (!pollingInterval || pollingInterval > innerPollingInterval)) {
                 pollingInterval = innerPollingInterval;

package/dist/shared/dynamic-component/dynamic-component.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"dynamic-component.js","sourceRoot":"","sources":["../../../js/shared/dynamic-component/dynamic-component.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAEH,QAAQ,EACR,IAAI,EACJ,UAAU,EACV,SAAS,EACT,eAAe,EACf,OAAO,EACP,MAAM,EACN,QAAQ,GACX,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,eAAe,MAAM,gDAAgD,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,kBAAkB,EAAE,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAC5G,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClF,OAAO,~~EAKH~~,~~qBAAqB,EACrB,~~iBAAiB,~~GACpB~~,MAAM,SAAS,CAAC;~~AACjB~~,OAAO,EAAwC,SAAS,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhH,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;;;;GAKG;AACH,SAAS,iCAAiC,CAAC,~~QAA+C~~;~~IACtF~~,IAAI,eAAwB,CAAC;IAE7B,IAAI,QAAQ,CAAC,gBAAgB,EAAE,CAAC;QAC5B,eAAe,GAAG,QAAQ,CAAC,gBAAgB,CAAC;IAChD,CAAC;IACD,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACjC,IAAI,iBAAiB,CAAC,KAAK,CAAC,~~IAAI,qBAAqB,CAAC,KAAK,CAAC,~~EAAE,CAAC;~~YAC3D~~,MAAM,oBAAoB,GAAG,iCAAiC,CAAC,KAAK,CAAC,CAAC;YACtE,IAAI,oBAAoB,IAAI,CAAC,CAAC,eAAe,IAAI,eAAe,GAAG,oBAAoB,CAAC,EAAE,CAAC;gBACvF,eAAe,GAAG,oBAAoB,CAAC;YAC3C,CAAC;QACL,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,eAAe,CAAC;AAC3B,CAAC;AAED;;;;;;GAMG;AACH,SAAS,sBAAsB,CAC3B,MAAwC,EACxC,iBAA0B;IAE1B,IAAI,eAAmC,CAAC;IAExC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACpC,IAAI,iBAAiB,CAAC,KAAK,CAAC,~~IAAI,qBAAqB,CAAC,KAAK,CAAC,~~EAAE,CAAC;~~YAC3D~~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"}
1	+ {"version":3,"file":"dynamic-component.js","sourceRoot":"","sources":["../../../js/shared/dynamic-component/dynamic-component.tsx"],"names":[],"mappings":"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"}

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

@@ -1,7 +1,7 @@
 import { type GetRecoilValue, type RecoilValue } from 'recoil';
 import { type WebSocketClientInterface } from '../../api';
 import { type RequestExtras } from '../../api/http';
-import { type DerivedDataVariable, type DerivedVariable, type GlobalTaskContext, type ResolvedDerivedVariable } from '../../types';
+import { type DerivedVariable, type GlobalTaskContext, type ResolvedDerivedVariable } from '../../types';
 import { type TriggerIndexValue } from './store';
 export interface DerivedVariableValueResponse<T> {
     cache_key: string;
@@ -17,7 +17,6 @@ interface FetchDerivedVariableArgs {
     cache: DerivedVariable['cache'];
     extras: RequestExtras;
     force_key?: string | null;
-    is_data_variable?: boolean;
     /**
      * selector instance key  - each selector's requests should be treated separately
      */
@@ -39,7 +38,7 @@ interface FetchDerivedVariableArgs {
  * - `values`, values to pass in the request
  * - `wsClient`, websocket client
  */
-export declare function fetchDerivedVariable<T>({ cache, extras, force_key, variableUid, values, wsClient, is_data_variable, }: FetchDerivedVariableArgs): Promise<DerivedVariableResponse<T>>;
+export declare function fetchDerivedVariable<T>({ cache, extras, force_key, variableUid, values, wsClient, }: FetchDerivedVariableArgs): Promise<DerivedVariableResponse<T>>;
 /**
  * Recursively build a deps array from a list of values
  * Values not in deps array are replaced with empty array
@@ -69,6 +68,12 @@ interface PreviousResult {
         result: any;
     };
     type: 'previous';
+    /**
+     * List of values to use in the refetch request (force_key is embedded directly in the values)
+     */
+    values: any[];
+    /** Key to the deps cache */
+    depsKey: string;
 }
 /**
  * DerivedVariable resolution result meaning that the value changed since last time
@@ -85,14 +90,16 @@ interface CurrentResult {
     selfTriggerForceKey: string | null;
     type: 'current';
     /**
-     * List of values to use in the refetch request (force_key is now embedded directly in the values)
+     * List of values to use in the refetch request (force_key is embedded directly in the values)
      */
     values: any[];
+    /** Key to the deps cache */
+    depsKey: string;
 }
 /**
  * Represents the result of a derived variable resolution.
  */
-type DerivedResult = PreviousResult | CurrentResult;
+export type DerivedResult = PreviousResult | CurrentResult;
 /**
  * Resolve a derived value from a list of dependant variables and their resolved values.
  *
@@ -106,13 +113,18 @@ type DerivedResult = PreviousResult | CurrentResult;
  * @param variables dependant variables
  * @param deps list of relevant dependant variables, akin to useEffect dependency array
  * @param resolvedVariables resolved values of dependant variables - turned into primitives and Resolved forms
- * @param wsClient websocket client
  * @param get getter function to resolve atoms to values
  * @param selfTrigger additional trigger index value to register as a dependency
  */
 export declare function resolveDerivedValue(key: string, variables: any[], // variable or primitive
 deps: any[], // variable or primitive
-resolvedVariables: any[], wsClient: WebSocketClientInterface, get: GetRecoilValue, selfTrigger?: TriggerIndexValue): DerivedResult;
+resolvedVariables: any[], get: GetRecoilValue, selfTrigger?: TriggerIndexValue): DerivedResult;
+/**
+ * Get or register a recoil selector for a given derived variable result object.
+ * Resolves the primitive values and returns either the previous cached result or an object
+ * signifying that we need to refetch the value.
+ */
+export declare function getOrRegisterDerivedVariableResult(variable: DerivedVariable, wsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, currentExtras: RequestExtras): RecoilValue<DerivedResult>;
 /**
  * Get a derived variable from the selector registry, registering it if not already registered
  *
@@ -121,7 +133,7 @@ resolvedVariables: any[], wsClient: WebSocketClientInterface, get: GetRecoilValu
  * @param tasks tasks list from context
  * @param currentExtras request extras to be merged into the options
  */
-export declare function getOrRegisterDerivedVariable(variable: DerivedVariable | DerivedDataVariable, wsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, currentExtras: RequestExtras): RecoilValue<DerivedVariableValueResponse<any>>;
+export declare function getOrRegisterDerivedVariable(variable: DerivedVariable, wsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, currentExtras: RequestExtras): RecoilValue<DerivedVariableValueResponse<any>>;
 /**
  * Get a derived selector for a derived variable.
  * Retrieves the value of the derived variable directly instead of returning an object with cache_key and value.
@@ -142,6 +154,6 @@ export declare function getOrRegisterDerivedVariableValue(variable: DerivedVaria
  * @param search search query
  * @param extras request extras to be merged into the options
  */
-export declare function useDerivedVariable(variable: DerivedVariable | DerivedDataVariable, WsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, extras: RequestExtras): RecoilValue<DerivedVariableValueResponse<any>>;
+export declare function useDerivedVariable(variable: DerivedVariable, WsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, extras: RequestExtras): RecoilValue<DerivedVariableValueResponse<any>>;
 export {};
 //# sourceMappingURL=derived-variable.d.ts.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"derived-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"AAKA,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;AAGjB,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,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B~~,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;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CAAC,CAAC,EAAE,EAC1C,KAAK,EACL,MAAM,EACN,SAAS,EACT,WAAW,EACX,MAAM,EACN,QAAQ,~~EACR~~,~~gBAAwB,GAC3B,~~EAAE,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAsBhE;~~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,cAAc,EAAE,GAAG,EAAE,CAAC;IACtB;;OAEG;IACH,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,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,wBAAgB,mBAAmB,CAC/B,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,aAAa,~~CAqHf~~;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,CAyBhD"}
1	+ {"version":3,"file":"derived-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"AAKA,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;AAM3E,OAAO,EACH,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,uBAAuB,EAQ/B,MAAM,SAAS,CAAC;AAIjB,OAAO,EACH,KAAK,iBAAiB,EAKzB,MAAM,SAAS,CAAC;AAGjB,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,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;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;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CAAC,CAAC,EAAE,EAC1C,KAAK,EACL,MAAM,EACN,SAAS,EACT,WAAW,EACX,MAAM,EACN,QAAQ,GACX,EAAE,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAsBhE;AAqGD;;;;;;GAMG;AAEH,wBAAgB,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,uBAAuB,GAAG,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,GAAG,EAAE,CAqB5F;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;IACjB;;OAEG;IACH,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,4BAA4B;IAC5B,OAAO,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,UAAU,aAAa;IACnB;;OAEG;IACH,cAAc,EAAE,GAAG,EAAE,CAAC;IACtB;;OAEG;IACH,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,IAAI,EAAE,SAAS,CAAC;IAChB;;OAEG;IACH,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,4BAA4B;IAC5B,OAAO,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,cAAc,GAAG,aAAa,CAAC;AAE3D;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CAC/B,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,GAAG,EAAE,EAAE,wBAAwB;AAC1C,IAAI,EAAE,GAAG,EAAE,EAAE,wBAAwB;AACrC,iBAAiB,EAAE,GAAG,EAAE,EACxB,GAAG,EAAE,cAAc,EACnB,WAAW,CAAC,EAAE,iBAAiB,GAChC,aAAa,CAyHf;AAED;;;;GAIG;AACH,wBAAgB,kCAAkC,CAC9C,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,wBAAwB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,aAAa,GAC7B,WAAW,CAAC,aAAa,CAAC,CAiE5B;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CACxC,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,wBAAwB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,aAAa,GAC7B,WAAW,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC,CAqIhD;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,EACzB,QAAQ,EAAE,wBAAwB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,MAAM,EAAE,aAAa,GACtB,WAAW,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC,CAyBhD"}

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

@@ -18,11 +18,12 @@ import { debounceTime, filter, share, switchMap, take } from 'rxjs/operators';
 import { HTTP_METHOD, validateResponse } from '@darajs/ui-utils';
 import { fetchTaskResult, request } from '../../api';
 import { RequestExtrasSerializable } from '../../api/http';
+import { TaskError } from '../../api/websocket';
 import { handleAuthErrors } from '../../auth/auth';
 import { getUniqueIdentifier } from '../../shared/utils/hashing';
 import { normalizeRequest } from '../../shared/utils/normalization';
 import useInterval from '../../shared/utils/use-interval';
-import { isCondition, isDerivedDataVariable, isDerivedVariable, isResolvedDataVariable, isResolvedDerivedDataVariable, isResolvedDerivedVariable, isResolvedSwitchVariable, isVariable, } from '../../types';
+import { isCondition, isResolvedDerivedVariable, isResolvedServerVariable, isResolvedSwitchVariable, isVariable, } from '../../types';
 // eslint-disable-next-line import/no-cycle
 import { cleanArgs, getOrRegisterTrigger, resolveNested, resolveVariable } from './internal';
 import { depsRegistry, getRegistryKey, selectorFamilyMembersRegistry, selectorFamilyRegistry, } from './store';
@@ -41,7 +42,7 @@ export function isTaskResponse(dvResponse) {
  * - `wsClient`, websocket client
  */
 export function fetchDerivedVariable(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ cache, extras, force_key, variableUid, values, wsClient, is_data_variable = false, }) {
+    return __awaiter(this, arguments, void 0, function* ({ cache, extras, force_key, variableUid, values, wsClient, }) {
         const cacheControl = cache === null ?
             {
                 'cache-control': 'none',
@@ -49,7 +50,7 @@ export function fetchDerivedVariable(_a) {
             : undefined;
         const ws_channel = yield wsClient.getChannel();
         const res = yield request(`/api/core/derived-variable/${variableUid}`, {
-            body: JSON.stringify({ is_data_variable, values, ws_channel, force_key: force_key !== null && force_key !== void 0 ? force_key : null }),
+            body: JSON.stringify({ values, ws_channel, force_key: force_key !== null && force_key !== void 0 ? force_key : null }),
             headers: Object.assign({}, cacheControl),
             method: HTTP_METHOD.POST,
         }, extras);
@@ -66,7 +67,7 @@ export function fetchDerivedVariable(_a) {
 const debouncedFetchSubjects = {};
 const debouncedFetchCache = {};
 function debouncedFetchDerivedVariable(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ variableUid, selectorKey, values, wsClient, extras, cache, force_key, is_data_variable = false, }) {
+    return __awaiter(this, arguments, void 0, function* ({ variableUid, selectorKey, values, wsClient, extras, cache, force_key, }) {
         // 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);
@@ -77,7 +78,6 @@ function debouncedFetchDerivedVariable(_a) {
             cache,
             extras,
             force_key,
-            is_data_variable,
             selectorKey,
             values,
             variableUid,
@@ -96,15 +96,15 @@ function debouncedFetchDerivedVariable(_a) {
  * @param getter recoil getter function
  */
 function resolveValue(value, getter) {
-    if (isResolvedDerivedVariable(value) || isResolvedDerivedDataVariable(value)) {
+    if (isResolvedDerivedVariable(value)) {
         const resolvedValues = value.values.map((v) => resolveValue(v, getter));
         return Object.assign(Object.assign({}, value), { values: resolvedValues });
     }
     if (isResolvedSwitchVariable(value)) {
         return Object.assign(Object.assign({}, value), { value: resolveValue(value.value, getter), value_map: resolveValue(value.value_map, getter), default: resolveValue(value.default, getter) });
     }
-    if (isResolvedDataVariable(value)) {
-        return value;
+    if (isResolvedServerVariable(value)) {
+        return Object.assign(Object.assign({}, value), { sequence_number: isRecoilValue(value.sequence_number) ? getter(value.sequence_number) : value.sequence_number });
     }
     if (isCondition(value)) {
         return Object.assign(Object.assign({}, value), {
@@ -129,9 +129,12 @@ export function getDeps(values, deps) {
         if (deps && !deps.includes(idx)) {
             return [];
         }
-        if (isResolvedDerivedVariable(val) || isResolvedDerivedDataVariable(val)) {
+        if (isResolvedDerivedVariable(val)) {
             return getDeps(val.values, val.deps).flat();
         }
+        if (isResolvedServerVariable(val)) {
+            return val.sequence_number;
+        }
         if (isResolvedSwitchVariable(val)) {
             // For switch variables, return the constituent parts as dependencies
             return getDeps([val.value, val.value_map, val.default], [0, 1, 2]).flat();
@@ -161,17 +164,16 @@ export function useTriggerIndex(variable) {
  * @param variables dependant variables
  * @param deps list of relevant dependant variables, akin to useEffect dependency array
  * @param resolvedVariables resolved values of dependant variables - turned into primitives and Resolved forms
- * @param wsClient websocket client
  * @param get getter function to resolve atoms to values
  * @param selfTrigger additional trigger index value to register as a dependency
  */
 export function resolveDerivedValue(key, variables, // variable or primitive
 deps, // variable or primitive
-resolvedVariables, wsClient, get, selfTrigger) {
+resolvedVariables, get, 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);
+    const triggers = registerChildTriggers(triggerList, get);
     if (selfTrigger) {
         triggers.unshift(selfTrigger);
     }
@@ -180,7 +182,7 @@ resolvedVariables, wsClient, get, selfTrigger) {
      * - 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
+     * - server variables are resolved to their sequence number
      */
     const values = resolvedVariables.map((v) => resolveValue(v, get));
     /**
@@ -221,6 +223,8 @@ resolvedVariables, wsClient, get, selfTrigger) {
             return {
                 entry: previousEntry,
                 type: 'previous',
+                values,
+                depsKey: key,
             };
         }
         // Otherwise continue and fetch new value, but first check what caused the change
@@ -260,6 +264,7 @@ resolvedVariables, wsClient, get, selfTrigger) {
             selfTriggerForceKey,
             type: 'current',
             values,
+            depsKey: key,
         };
     }
     return {
@@ -267,18 +272,16 @@ resolvedVariables, wsClient, get, selfTrigger) {
         selfTriggerForceKey: null,
         type: 'current',
         values,
+        depsKey: key,
     };
 }
 /**
- * Get a derived variable from the selector registry, registering it if not already registered
- *
- * @param variable variable to register
- * @param wsClient WebSocket client from context
- * @param tasks tasks list from context
- * @param currentExtras request extras to be merged into the options
+ * Get or register a recoil selector for a given derived variable result object.
+ * Resolves the primitive values and returns either the previous cached result or an object
+ * signifying that we need to refetch the value.
  */
-export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, currentExtras) {
-    const key = getRegistryKey(variable, 'selector');
+export function getOrRegisterDerivedVariableResult(variable, wsClient, taskContext, currentExtras) {
+    const key = getRegistryKey(variable, 'result-selector');
     if (!selectorFamilyRegistry.has(key)) {
         getOrRegisterTrigger(variable);
         // register a family for this particular variable
@@ -292,30 +295,69 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, cu
                  *
                  * For derived variables, put ResolvedDerivedVariable object with values resolved to recoil atoms/selectors,
                  * and deps resolved to array of indexes of variables (or null if not set)
-                 * For data variables, put ResolvedDataVariable object.
                  */
-                const resolvedVariables = variable.variables.map((v) => {
+                const resolvedVariables = yield Promise.all(variable.variables.map((v) => __awaiter(this, void 0, void 0, function* () {
                     // Handle non-variables - plain values could be injected via LoopVariable
                     if (!isVariable(v)) {
-                        return v;
+                        return Promise.resolve(v);
                     }
                     return resolveVariable(v, wsClient, taskContext, currentExtras);
-                });
+                })));
                 const selfTrigger = get(getOrRegisterTrigger(variable));
-                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 = resolveDerivedValue(selectorKey, variable.variables, variable.deps, resolvedVariables, wsClient, get, selfTrigger);
+                const derivedResult = resolveDerivedValue(selectorKey, variable.variables, variable.deps, resolvedVariables, get, selfTrigger);
+                return derivedResult;
+            }),
+            key: nanoid(),
+        }));
+    }
+    const family = selectorFamilyRegistry.get(key);
+    // Get a selector instance for this particular extras value
+    // This is required as otherwise the selector is not aware of different possible extras values
+    // at the call site of e.g. useVariable and would otherwise be a stale closure using the initial extras when
+    // first registered
+    const serializableExtras = new RequestExtrasSerializable(currentExtras);
+    const selectorInstance = family(serializableExtras);
+    // register selector instance in the selector family registry
+    if (!selectorFamilyMembersRegistry.has(family)) {
+        selectorFamilyMembersRegistry.set(family, new Map());
+    }
+    selectorFamilyMembersRegistry.get(family).set(serializableExtras.toJSON(), selectorInstance);
+    return selectorInstance;
+}
+/**
+ * Get a derived variable from the selector registry, registering it if not already registered
+ *
+ * @param variable variable to register
+ * @param wsClient WebSocket client from context
+ * @param tasks tasks list from context
+ * @param currentExtras request extras to be merged into the options
+ */
+export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, currentExtras) {
+    const key = getRegistryKey(variable, 'selector');
+    if (!selectorFamilyRegistry.has(key)) {
+        getOrRegisterTrigger(variable);
+        // register a family for this particular variable
+        selectorFamilyRegistry.set(key, selectorFamily({
+            cachePolicy_UNSTABLE: {
+                eviction: 'most-recent',
+            },
+            get: (extrasSerializable) => (_a) => __awaiter(this, [_a], void 0, function* ({ get }) {
+                const selectorKey = key + extrasSerializable.toJSON();
+                // get the result selector instance for this extras value
+                const dvResultSelector = getOrRegisterDerivedVariableResult(variable, wsClient, taskContext, extrasSerializable.extras);
+                const derivedResult = get(dvResultSelector);
                 if (derivedResult.type === 'previous') {
                     return { cache_key: derivedResult.entry.cacheKey, value: derivedResult.entry.result };
                 }
+                const { extras } = extrasSerializable;
                 let variableResponse = null;
                 try {
                     variableResponse = yield debouncedFetchDerivedVariable({
                         cache: variable.cache,
                         extras,
                         force_key: derivedResult.selfTriggerForceKey,
-                        is_data_variable: isDerivedDataVariable(variable),
                         selectorKey,
                         values: normalizeRequest(cleanArgs(derivedResult.values), variable.variables),
                         variableUid: variable.uid,
@@ -330,50 +372,51 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, cu
                 }
                 const cacheKey = variableResponse.cache_key;
                 let variableValue = null;
-                // We're only interested in the actual value for DVs.
-                // For DerivedDataVariables we only need the cache key and the backend will handle the rest, regardless
-                // of whether it's running as a task or not
-                if (isDerivedVariable(variable)) {
-                    // If there is a task running related to the current variable then something has changed, so cancel them
-                    taskContext.cleanupRunningTasks(variable.uid);
-                    // If the variable is computed as a task then wait for it to finish and fetch the result
-                    if (isTaskResponse(variableResponse)) {
-                        const taskId = variableResponse.task_id;
-                        // register task being started
-                        taskContext.startTask(taskId, variable.uid, getRegistryKey(variable, 'trigger'));
-                        try {
-                            yield wsClient.waitForTask(taskId);
-                        }
-                        catch (_b) {
-                            // If there was an error waiting for task it means it was cancelled (by a re-run)
-                            // It should be safe to return `null` here as the selector will re-run and throw suspense again
-                            return {
-                                cache_key: cacheKey,
-                                value: null,
-                            };
-                        }
-                        finally {
-                            taskContext.endTask(taskId);
-                        }
-                        try {
-                            variableValue = yield fetchTaskResult(taskId, extras);
-                        }
-                        catch (e) {
+                // If there is a task running related to the current variable then something has changed, so cancel them
+                taskContext.cleanupRunningTasks(variable.uid);
+                // If the variable is computed as a task then wait for it to finish and fetch the result
+                if (isTaskResponse(variableResponse)) {
+                    const taskId = variableResponse.task_id;
+                    // register task being started
+                    taskContext.startTask(taskId, variable.uid, getRegistryKey(variable, 'trigger'));
+                    try {
+                        yield wsClient.waitForTask(taskId);
+                    }
+                    catch (e) {
+                        if (e instanceof TaskError) {
                             // On DV task error put selectorId and extras into the error so the boundary can reset the selector cache
                             e.selectorId = key;
                             e.selectorExtras = extrasSerializable.toJSON();
                             throw e;
                         }
+                        // should be a TaskCancelledError
+                        // It should be safe to return `null` here as the selector will re-run and throw suspense again
+                        return {
+                            cache_key: cacheKey,
+                            value: null,
+                        };
                     }
-                    else {
-                        variableValue = variableResponse.value;
+                    finally {
+                        taskContext.endTask(taskId);
                     }
+                    try {
+                        variableValue = yield fetchTaskResult(taskId, extras);
+                    }
+                    catch (e) {
+                        // On DV task error put selectorId and extras into the error so the boundary can reset the selector cache
+                        e.selectorId = key;
+                        e.selectorExtras = extrasSerializable.toJSON();
+                        throw e;
+                    }
+                }
+                else {
+                    variableValue = variableResponse.value;
                 }
-                // Store the final result and arguments used if deps is specified
-                // resolve nested if defined (i.e. for DerivedVariable, DerivedDataVariable does not have nested)
+                // resolve nested if defined
                 variableValue =
                     'nested' in variable ? resolveNested(variableValue, variable.nested) : variableValue;
-                depsRegistry.set(selectorKey, {
+                // Store the final result and arguments used
+                depsRegistry.set(derivedResult.depsKey, {
                     args: derivedResult.relevantValues,
                     cacheKey,
                     result: variableValue,