@darajs/core 1.20.0 → 1.20.1-alpha.1

package/dist/actions/download-variable.d.ts

@@ -1,12 +1,4 @@
-import { type ActionHandler, type DataFrame, type DownloadVariableImpl } from '../types/core';
-/**
- * Restore original column names by inverting pandas_utils transformations
- */
-export declare const restoreColumnName: (colName: string) => string;
-/**
- * Process data to restore original column structure before creating matrix
- */
-export declare const processDataForDownload: (content: DataFrame) => DataFrame;
+import { type ActionHandler, type DownloadVariableImpl } from '../types/core';
 /**
  * Frontend handler for DownloadVariable action
  * Retrieves the variable value and downloads the variable as either a csv, json or xl file

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

@@ -1 +1 @@
-{"version":3,"file":"download-variable.d.ts","sourceRoot":"","sources":["../../js/actions/download-variable.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,KAAK,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAK7F;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,SAAS,MAAM,KAAG,MAcnD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,SAAS,SAAS,KAAG,SAgB3D,CAAC;AAsHF;;;GAGG;AACH,QAAA,MAAM,gBAAgB,EAAE,aAAa,CAAC,oBAAoB,CAuCzD,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"download-variable.d.ts","sourceRoot":"","sources":["../../js/actions/download-variable.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAmH7E;;;GAGG;AACH,QAAA,MAAM,gBAAgB,EAAE,aAAa,CAAC,oBAAoB,CAoCzD,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/actions/download-variable.js

@@ -9,50 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import * as xl from 'exceljs';
 import { saveAs } from 'file-saver';
-import { Status } from '@darajs/ui-utils';
-import { getTabularVariableValue } from '../shared';
+import { getVariableValue } from '../shared/interactivity/use-variable-value';
 import {} from '../types/core';
-const COL_PATTERN = /^__col__\d+__(.+)$/;
-const INDEX_PATTERN = /^__index__\d+__(.+)$/;
-/**
- * Restore original column names by inverting pandas_utils transformations
- */
-export const restoreColumnName = (colName) => {
-    // Handle __col__N__originalName format
-    const colMatch = colName.match(COL_PATTERN);
-    if (colMatch) {
-        return colMatch[1];
-    }
-    // Handle __index__N__originalName format
-    const indexMatch = colName.match(INDEX_PATTERN);
-    if (indexMatch) {
-        return indexMatch[1];
-    }
-    return colName;
-};
-/**
- * Process data to restore original column structure before creating matrix
- */
-export const processDataForDownload = (content) => {
-    return content.map((row) => {
-        const processedRow = {};
-        Object.entries(row).forEach(([key, value]) => {
-            // Skip __index__ columns entirely for downloads, keep the `__index__N__originalName` format
-            if (key === '__index__') {
-                return;
-            }
-            const restoredKey = restoreColumnName(key);
-            processedRow[restoredKey] = value;
-        });
-        return processedRow;
-    });
-};
 const createMatrixFromArrayOfObjects = (content) => {
-    // Process the data to restore original column names and remove index columns
-    const processedContent = processDataForDownload(content);
     const headings = [];
     const indexes = {};
-    processedContent.forEach((c) => {
+    content.forEach((c) => {
         Object.keys(c).forEach((k) => {
             if (!headings.includes(k)) {
                 headings.push(k);
@@ -62,7 +24,7 @@ const createMatrixFromArrayOfObjects = (content) => {
     });
     const headingsLength = headings.length;
     const matrix = [];
-    processedContent.forEach((c) => {
+    content.forEach((c) => {
         const row = new Array(headingsLength);
         Object.entries(c).forEach(([k, v]) => {
             row[indexes[k]] = v;
@@ -142,26 +104,23 @@ const createMatrixFromValue = (val) => {
  * Retrieves the variable value and downloads the variable as either a csv, json or xl file
  */
 const DownloadVariable = (ctx, actionImpl) => __awaiter(void 0, void 0, void 0, function* () {
-    let value = yield getTabularVariableValue(actionImpl.variable, {
+    let value = getVariableValue(actionImpl.variable, true, {
         client: ctx.wsClient,
         extras: ctx.extras,
         search: ctx.location.search,
         snapshot: ctx.snapshot,
         taskContext: ctx.taskCtx,
     });
-    if (value === null) {
-        ctx.notificationCtx.pushNotification({
-            key: '_downloadVariable',
-            message: 'Failed to fetch the variable value',
-            status: Status.ERROR,
-            title: 'Error fetching variable value',
-        });
-        return;
+    if (value instanceof Promise) {
+        value = yield value;
     }
-    // Process data to restore original column structure and remove internal columns if it's in tabular format
-    // this simply cleans keys in [{record1}, {record2}] format
-    if (Array.isArray(value)) {
-        value = processDataForDownload(value);
+    // strip the __index__ column from data vars
+    if (actionImpl.variable.__typename === 'DataVariable' || actionImpl.variable.__typename === 'DerivedDataVariable') {
+        for (const row of value) {
+            if ('__index__' in row) {
+                delete row.__index__;
+            }
+        }
     }
     const fileName = actionImpl.file_name || 'Data';
     const fileNameWithExt = `${fileName}.${actionImpl.type}`;

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

@@ -1 +1 @@
-{"version":3,"file":"download-variable.js","sourceRoot":"","sources":["../../js/actions/download-variable.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,EAAiE,MAAM,cAAc,CAAC;AAE7F,MAAM,WAAW,GAAG,oBAAoB,CAAC;AACzC,MAAM,aAAa,GAAG,sBAAsB,CAAC;AAE7C;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,OAAe,EAAU,EAAE;IACzD,uCAAuC;IACvC,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC5C,IAAI,QAAQ,EAAE,CAAC;QACX,OAAO,QAAQ,CAAC,CAAC,CAAE,CAAC;IACxB,CAAC;IAED,yCAAyC;IACzC,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAChD,IAAI,UAAU,EAAE,CAAC;QACb,OAAO,UAAU,CAAC,CAAC,CAAE,CAAC;IAC1B,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAkB,EAAa,EAAE;IACpE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACvB,MAAM,YAAY,GAAwB,EAAE,CAAC;QAE7C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACzC,4FAA4F;YAC5F,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;gBACtB,OAAO;YACX,CAAC;YAED,MAAM,WAAW,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAC3C,YAAY,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,OAAO,YAAY,CAAC;IACxB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,CAAC,OAAmC,EAAW,EAAE;IACpF,6EAA6E;IAC7E,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAEzD,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC3B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACzB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACjB,OAAO,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YACrC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC;IAEvC,MAAM,MAAM,GAAY,EAAE,CAAC;IAE3B,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC3B,MAAM,GAAG,GAAU,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;QAC7C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACjC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEzB,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,GAAG,CAAC,IAAS,EAAU,EAAE;IACtC,IAAI,SAAS,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAElD,kGAAkG;IAClG,IAAI,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,SAAS,GAAG,IAAI,SAAS,GAAG,CAAC;IACjC,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,MAAe,EAAQ,EAAE;IAClD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3F,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,GAAQ,EAAQ,EAAE;IACtC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC1C,OAAO,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAO,IAAY,EAAE,MAAe,EAAiB,EAAE;IAC9E,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;IAE7B,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAEjC,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACnC,YAAY,EAAE,IAAI;QAClB,IAAI,EAAE,CAAC;KACV,CAAC,CAAC,CAAC;IAEJ,MAAM,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IACzB,IAAI,CAAC,KAAK,EAAE,CAAC;IAEb,EAAE,CAAC,QAAQ,CAAC;QACR,OAAO;QACP,SAAS,EAAE,IAAI;QACf,IAAI,EAAE,WAAW;QACjB,GAAG,EAAE,IAAI;QACT,IAAI;QACJ,KAAK,EAAE;YACH,cAAc,EAAE,IAAI;YACpB,KAAK,EAAE,mBAAmB;SAC7B;QACD,SAAS,EAAE,KAAK;KACnB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAEzC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,mEAAmE,EAAE,CAAC,CAAC;IAE7G,OAAO,IAAI,CAAC;AAChB,CAAC,CAAA,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,GAAyC,EAAkB,EAAE;IACxF,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAE7B,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,QAAQ,GAAG,IAAI,CAAC;QACpB,CAAC;QACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC1B,gBAAgB,GAAG,IAAI,CAAC;QAC5B,CAAC;IACL,CAAC;IAED,IAAI,gBAAgB,EAAE,CAAC;QACnB,OAAO,8BAA8B,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,QAAQ,EAAE,CAAC;QACX,OAAO,GAAc,CAAC;IAC1B,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,gBAAgB,GAAwC,CAAO,GAAG,EAAE,UAAU,EAAiB,EAAE;IACnG,IAAI,KAAK,GAAG,MAAM,uBAAuB,CAAC,UAAU,CAAC,QAAQ,EAAE;QAC3D,MAAM,EAAE,GAAG,CAAC,QAAQ;QACpB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,MAAM;QAC3B,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,WAAW,EAAE,GAAG,CAAC,OAAO;KAC3B,CAAC,CAAC;IAEH,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACjB,GAAG,CAAC,eAAe,CAAC,gBAAgB,CAAC;YACjC,GAAG,EAAE,mBAAmB;YACxB,OAAO,EAAE,oCAAoC;YAC7C,MAAM,EAAE,MAAM,CAAC,KAAK;YACpB,KAAK,EAAE,+BAA+B;SACzC,CAAC,CAAC;QACH,OAAO;IACX,CAAC;IAED,0GAA0G;IAC1G,2DAA2D;IAC3D,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,KAAK,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,IAAI,MAAM,CAAC;IAChD,MAAM,eAAe,GAAG,GAAG,QAAQ,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;IACzD,IAAI,UAAU,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACnC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAC9B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IACD,MAAM,MAAM,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAC5C,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IAC1D,CAAC;IACD,MAAM,QAAQ,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,KAAK,MAAM,CAAC;IAChE,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACjG,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AAClC,CAAC,CAAA,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"download-variable.js","sourceRoot":"","sources":["../../js/actions/download-variable.tsx"],"names":[],"mappings":"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"}

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":"AAIA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAG3E;;;GAGG;AACH,QAAA,MAAM,cAAc,EAAE,aAAa,CAAC,kBAAkB,CA8BrD,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"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"}

package/dist/actions/reset-variables.js

@@ -1,43 +1,38 @@
-import { nanoid } from 'nanoid';
 import { getOrRegisterPlainVariable } from '../shared/interactivity/plain-variable';
 import { getOrRegisterTrigger } from '../shared/interactivity/triggers';
+import { getOrRegisterUrlVariable } from '../shared/interactivity/url-variable';
 import {} from '../types/core';
-import { isDerivedVariable, isServerVariable, isStateVariable, isSwitchVariable, isVariable } from '../types/utils';
+import { isDataVariable, isDerivedDataVariable, isDerivedVariable, isSwitchVariable, isUrlVariable, isVariable, } from '../types/utils';
 /**
  * Front-end handler for ResetVariables action.
  * Sequentially resets variables to their default values (or forces a recalculation for DerivedVariables)
  */
 const ResetVariables = (ctx, actionImpl) => {
     actionImpl.variables.filter(isVariable).forEach((variable) => {
-        var _a;
         // For DVs, trigger their recalculation
-        if (isDerivedVariable(variable)) {
+        if (isDerivedVariable(variable) || isDerivedDataVariable(variable)) {
             const triggerAtom = getOrRegisterTrigger(variable);
             ctx.set(triggerAtom, (triggerIndexValue) => ({
-                force_key: nanoid(),
+                force: true,
                 inc: triggerIndexValue.inc + 1,
             }));
         }
-        else if (isSwitchVariable(variable)) {
-            // cannot reset switch variables
+        else if (isUrlVariable(variable)) {
+            // For UrlVariables, we use set instead of reset to update the URL as well; otherwise just the atom is reset
+            const urlAtom = getOrRegisterUrlVariable(variable);
+            ctx.set(urlAtom, variable.default);
+            ctx.eventBus.publish('URL_VARIABLE_LOADED', { variable, value: variable.default });
         }
-        else if (isStateVariable(variable)) {
-            // StateVariables cannot be reset as they track parent DerivedVariable state
-            // This is a noop - the state will update when the parent DerivedVariable changes
+        else if (isDataVariable(variable)) {
+            // for data variables this is a noop
         }
-        else if (isServerVariable(variable)) {
-            // ServerVariables cannot be reset currently as they might not even have a default value (user stores)
+        else if (isSwitchVariable(variable)) {
+            // cannot reset switch variables
         }
         else {
+            // For plain variables reset them to default values
             const plainAtom = getOrRegisterPlainVariable(variable, ctx.wsClient, ctx.taskCtx, ctx.extras);
-            if (((_a = variable.store) === null || _a === void 0 ? void 0 : _a.__typename) === 'QueryParamStore') {
-                // NOTE: using set(..., default) instead of reset,
-                // as reset doesn't properly reset the query param
-                ctx.set(plainAtom, variable.default);
-            }
-            else {
-                ctx.reset(plainAtom);
-            }
+            ctx.reset(plainAtom);
             ctx.eventBus.publish('PLAIN_VARIABLE_LOADED', { variable, value: variable.default });
         }
     });

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,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAA+C,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,eAAe,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEnH;;;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,EAAE,CAAC;YAC9B,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,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpC,gCAAgC;QACpC,CAAC;aAAM,IAAI,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnC,4EAA4E;YAC5E,iFAAiF;QACrF,CAAC;aAAM,IAAI,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpC,sGAAsG;QAC1G,CAAC;aAAM,CAAC;YACJ,MAAM,SAAS,GAAG,0BAA0B,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;YAC9F,IAAI,CAAA,MAAA,QAAQ,CAAC,KAAK,0CAAE,UAAU,MAAK,iBAAiB,EAAE,CAAC;gBACnD,kDAAkD;gBAClD,kDAAkD;gBAClD,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;YACzC,CAAC;iBAAM,CAAC;gBACJ,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACzB,CAAC;YAED,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,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"}

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":"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"}
+{"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"}

package/dist/actions/trigger-variable.js

@@ -1,4 +1,3 @@
-import { nanoid } from 'nanoid';
 import { getOrRegisterTrigger } from '../shared/interactivity/triggers';
 import {} from '../types/core';
 /**
@@ -8,8 +7,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,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"}
+{"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"update-variable.d.ts","sourceRoot":"","sources":["../../js/actions/update-variable.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAa,MAAM,cAAc,CAAC;AAEtF;;GAEG;AACH,eAAO,MAAM,KAAK,mBAAmB,CAAC;AAEtC;;GAEG;AACH,eAAO,MAAM,MAAM,oBAAoB,CAAC;AAExC;;GAEG;AACH,QAAA,MAAM,cAAc,EAAE,aAAa,CAAC,kBAAkB,CAqBrD,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"update-variable.d.ts","sourceRoot":"","sources":["../../js/actions/update-variable.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAE3E;;GAEG;AACH,eAAO,MAAM,KAAK,mBAAmB,CAAC;AAEtC;;GAEG;AACH,eAAO,MAAM,MAAM,oBAAoB,CAAC;AAExC;;GAEG;AACH,QAAA,MAAM,cAAc,EAAE,aAAa,CAAC,kBAAkB,CAiCrD,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/dist/actions/update-variable.js

@@ -8,7 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { getOrRegisterPlainVariable } from '../shared/interactivity/plain-variable';
-import { UserError } from '../types/core';
+import { getOrRegisterUrlVariable } from '../shared/interactivity/url-variable';
+import {} from '../types/core';
 /**
  * Constant to replace with the input value.
  */
@@ -21,10 +22,21 @@ export const TOGGLE = '__dara_toggle__';
  * Front-end handler for UpdateVariable action.
  */
 const UpdateVariable = (ctx, actionImpl) => __awaiter(void 0, void 0, void 0, function* () {
-    if (actionImpl.variable.__typename !== 'Variable') {
-        throw new UserError('UpdateVariable action only supports Variables');
+    let varAtom;
+    let eventName;
+    // Make sure the variable is registered
+    switch (actionImpl.variable.__typename) {
+        case 'Variable':
+            varAtom = getOrRegisterPlainVariable(actionImpl.variable, ctx.wsClient, ctx.taskCtx, ctx.extras);
+            eventName = 'PLAIN_VARIABLE_LOADED';
+            break;
+        case 'UrlVariable':
+            varAtom = getOrRegisterUrlVariable(actionImpl.variable);
+            eventName = 'URL_VARIABLE_LOADED';
+            break;
+        case 'DataVariable':
+            throw new Error('DataVariable is not supported in UpdateVariable action');
     }
-    const varAtom = getOrRegisterPlainVariable(actionImpl.variable, ctx.wsClient, ctx.taskCtx, ctx.extras);
     let newValue;
     if (actionImpl.value === INPUT) {
         newValue = ctx.input;
@@ -39,7 +51,7 @@ const UpdateVariable = (ctx, actionImpl) => __awaiter(void 0, void 0, void 0, fu
         newValue = actionImpl.value;
     }
     ctx.set(varAtom, newValue);
-    ctx.eventBus.publish('PLAIN_VARIABLE_LOADED', { variable: actionImpl.variable, value: newValue });
+    ctx.eventBus.publish(eventName, { variable: actionImpl.variable, value: newValue });
 });
 export default UpdateVariable;
 //# sourceMappingURL=update-variable.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"update-variable.js","sourceRoot":"","sources":["../../js/actions/update-variable.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAA+C,SAAS,EAAE,MAAM,cAAc,CAAC;AAEtF;;GAEG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,gBAAgB,CAAC;AAEtC;;GAEG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,iBAAiB,CAAC;AAExC;;GAEG;AACH,MAAM,cAAc,GAAsC,CAAO,GAAG,EAAE,UAAU,EAAE,EAAE;IAChF,IAAI,UAAU,CAAC,QAAQ,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;QAChD,MAAM,IAAI,SAAS,CAAC,+CAA+C,CAAC,CAAC;IACzE,CAAC;IACD,MAAM,OAAO,GAAG,0BAA0B,CAAC,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAEvG,IAAI,QAAQ,CAAC;IAEb,IAAI,UAAU,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;QAC7B,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC;IACzB,CAAC;SAAM,IAAI,UAAU,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;QACrC,gFAAgF;QAChF,mEAAmE;QACnE,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;QAClE,QAAQ,GAAG,CAAC,KAAK,CAAC;IACtB,CAAC;SAAM,CAAC;QACJ,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC;IAChC,CAAC;IAED,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC3B,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAe,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;AAC7G,CAAC,CAAA,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"update-variable.js","sourceRoot":"","sources":["../../js/actions/update-variable.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAA+C,MAAM,cAAc,CAAC;AAE3E;;GAEG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,gBAAgB,CAAC;AAEtC;;GAEG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,iBAAiB,CAAC;AAExC;;GAEG;AACH,MAAM,cAAc,GAAsC,CAAO,GAAG,EAAE,UAAU,EAAE,EAAE;IAChF,IAAI,OAAO,CAAC;IACZ,IAAI,SAA0D,CAAC;IAE/D,uCAAuC;IACvC,QAAQ,UAAU,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QACrC,KAAK,UAAU;YACX,OAAO,GAAG,0BAA0B,CAAC,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;YACjG,SAAS,GAAG,uBAAuB,CAAC;YACpC,MAAM;QACV,KAAK,aAAa;YACd,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACxD,SAAS,GAAG,qBAAqB,CAAC;YAClC,MAAM;QACV,KAAK,cAAc;YACf,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAClF,CAAC;IAED,IAAI,QAAQ,CAAC;IAEb,IAAI,UAAU,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;QAC7B,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC;IACzB,CAAC;SAAM,IAAI,UAAU,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;QACrC,gFAAgF;QAChF,mEAAmE;QACnE,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;QAClE,QAAQ,GAAG,CAAC,KAAK,CAAC;IACtB,CAAC;SAAM,CAAC;QACJ,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC;IAChC,CAAC;IAED,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC3B,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAe,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;AAC/F,CAAC,CAAA,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/dist/api/websocket.d.ts

@@ -1,13 +1,5 @@
 import { Observable, Subject } from 'rxjs';
 import type { ActionImpl, AnyVariable } from '../types';
-export declare class TaskCancelledError extends Error {
-    task_id: string;
-    constructor(message: string, task_id: string);
-}
-export declare class TaskError extends Error {
-    task_id: string;
-    constructor(message: string, task_id: string);
-}
 interface InitMessage {
     message: {
         channel: string;
@@ -28,31 +20,27 @@ export declare enum TaskStatus {
     ERROR = "ERROR",
     PROGRESS = "PROGRESS"
 }
-type TaskNotificationMessageContent = {
-    status: TaskStatus.COMPLETE;
-    task_id: string;
-} | {
-    status: TaskStatus.ERROR;
-    task_id: string;
-    error: string;
-} | {
-    status: TaskStatus.PROGRESS;
-    task_id: string;
-    progress: number;
-    message: string;
-} | {
-    status: TaskStatus.CANCELED;
-    task_id: string;
-};
+export interface ProgressNotificationMessage {
+    message: {
+        message: string;
+        progress: number;
+        status: TaskStatus.PROGRESS;
+        task_id: string;
+    };
+    type: 'message';
+}
 export interface TaskNotificationMessage {
-    message: TaskNotificationMessageContent;
+    message: {
+        status: TaskStatus;
+        task_id: string;
+    };
     type: 'message';
 }
-export interface ProgressNotificationMessage {
+export interface ServerTriggerMessage {
+    message: {
+        data_id: string;
+    };
     type: 'message';
-    message: Extract<TaskNotificationMessageContent, {
-        status: TaskStatus.PROGRESS;
-    }>;
 }
 export interface ServerErrorMessage {
     message: {
@@ -74,7 +62,7 @@ export interface ActionMessage {
         /**
          * Action implementation instance
          */
-        action: ActionImpl | null;
+        action: ActionImpl;
         /**
          * Execution uid
          */
@@ -103,14 +91,6 @@ export interface BackendStorePatchMessage {
     };
     type: 'message';
 }
-export interface ServerVariableMessage {
-    message: {
-        __type: 'ServerVariable';
-        uid: string;
-        sequence_number: number;
-    };
-    type: 'message';
-}
 export interface CustomMessage {
     message: {
         data: any;
@@ -122,21 +102,11 @@ export interface CustomMessage {
     };
     type: 'custom';
 }
-export type WebSocketMessage = InitMessage | PingPongMessage | TokenUpdateMessage | TaskNotificationMessage | ProgressNotificationMessage | ServerErrorMessage | ServerVariableMessage | VariableRequestMessage | ActionMessage | BackendStoreMessage | BackendStorePatchMessage | CustomMessage;
-export declare function isInitMessage(message: WebSocketMessage): message is InitMessage;
-export declare function isTaskNotification(message: WebSocketMessage): message is TaskNotificationMessage;
-export declare function isServerVariableMessage(message: WebSocketMessage): message is ServerVariableMessage;
-export declare function isServerErrorMessage(message: WebSocketMessage): message is ServerErrorMessage;
-export declare function isVariableRequestMessage(message: WebSocketMessage): message is VariableRequestMessage;
-export declare function isActionMessage(message: WebSocketMessage): message is ActionMessage;
-export declare function isBackendStoreMessage(message: WebSocketMessage): message is BackendStoreMessage;
-export declare function isBackendStorePatchMessage(message: WebSocketMessage): message is BackendStorePatchMessage;
-export declare function isCustomMessage(message: WebSocketMessage): message is CustomMessage;
+export type WebSocketMessage = InitMessage | PingPongMessage | TokenUpdateMessage | TaskNotificationMessage | ProgressNotificationMessage | ServerTriggerMessage | ServerErrorMessage | VariableRequestMessage | ActionMessage | BackendStoreMessage | BackendStorePatchMessage | CustomMessage;
 export interface WebSocketClientInterface {
-    actionMessages$: (executionId: string) => Observable<ActionImpl | null>;
+    actionMessages$: (executionId: string) => Observable<ActionImpl>;
     backendStoreMessages$(): Observable<BackendStoreMessage['message']>;
     backendStorePatchMessages$(): Observable<BackendStorePatchMessage['message']>;
-    serverVariableMessages$(): Observable<ServerVariableMessage['message']>;
     channel$: () => Observable<string>;
     customMessages$: () => Observable<CustomMessage>;
     getChannel: () => Promise<string>;
@@ -145,6 +115,7 @@ export interface WebSocketClientInterface {
     sendMessage(value: any, channel: string, chunkCount?: number): void;
     sendVariable: (value: any, channel: string) => void;
     serverErrors$: () => Observable<ServerErrorMessage>;
+    serverTriggers$: (data_id: string) => Observable<ServerTriggerMessage>;
     taskStatusUpdates$: (...task_ids: string[]) => Observable<TaskStatus>;
     variableRequests$: () => Observable<VariableRequestMessage>;
     waitForTask: (task_id: string) => Promise<any>;
@@ -178,7 +149,6 @@ export declare class WebSocketClient implements WebSocketClientInterface {
     getChannel(): Promise<string>;
     backendStoreMessages$(): Observable<BackendStoreMessage['message']>;
     backendStorePatchMessages$(): Observable<BackendStorePatchMessage['message']>;
-    serverVariableMessages$(): Observable<ServerVariableMessage['message']>;
     /**
      * Get the observable to receive the new channel when the socket reconnects
      */
@@ -195,6 +165,12 @@ export declare class WebSocketClient implements WebSocketClientInterface {
      * @param task_ids the ids of the task to receive updates from
      */
     progressUpdates$(...task_ids: string[]): Observable<ProgressNotificationMessage>;
+    /**
+     * Get the observable to receive server trigger messages for a given data variable
+     *
+     * @param dataId id of the data variable triggered
+     */
+    serverTriggers$(dataId: string): Observable<ServerTriggerMessage>;
     /**
      * Get the observable to receive server error messages
      */
@@ -208,13 +184,13 @@ export declare class WebSocketClient implements WebSocketClientInterface {
      *
      * @param executionId id of the execution to receive action implementations for
      */
-    actionMessages$(executionId: string): Observable<ActionImpl | null>;
+    actionMessages$(executionId: string): Observable<ActionImpl>;
     /**
      * Get the observable to receive custom messages
      */
     customMessages$(): Observable<CustomMessage>;
     /**
-     * Returns a promise that will resolve when the task is completed. If the task is cancelled or errored then this will throw an
+     * Returns a promise that will resolve when the task is completed. If the task is cancelled then this will throw an
      * error to signify that.
      *
      * @param task_id the id of the task to wait for

package/dist/api/websocket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"websocket.d.ts","sourceRoot":"","sources":["../../js/api/websocket.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"websocket.d.ts","sourceRoot":"","sources":["../../js/api/websocket.tsx"],"names":[],"mappings":"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"}

package/dist/api/websocket.js

@@ -10,7 +10,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _WebSocketClient_pingInterval, _WebSocketClient_socketUrl, _WebSocketClient_reconnectCount;
-/* eslint-disable max-classes-per-file */
 import { nanoid } from 'nanoid';
 import { Observable, Subject } from 'rxjs';
 import { filter, map, take } from 'rxjs/operators';
@@ -20,18 +19,6 @@ const interAttemptTimeout = 500;
 const maxDisconnectedTime = 10000;
 const interPingInterval = 5000;
 const maxAttempts = Math.round(maxDisconnectedTime / interAttemptTimeout);
-export class TaskCancelledError extends Error {
-    constructor(message, task_id) {
-        super(message);
-        this.task_id = task_id;
-    }
-}
-export class TaskError extends Error {
-    constructor(message, task_id) {
-        super(message);
-        this.task_id = task_id;
-    }
-}
 export var TaskStatus;
 (function (TaskStatus) {
     TaskStatus["CANCELED"] = "CANCELED";
@@ -39,31 +26,31 @@ export var TaskStatus;
     TaskStatus["ERROR"] = "ERROR";
     TaskStatus["PROGRESS"] = "PROGRESS";
 })(TaskStatus || (TaskStatus = {}));
-export function isInitMessage(message) {
+function isInitMessage(message) {
     return message.type === 'init';
 }
-export function isTaskNotification(message) {
+function isTaskNotification(message) {
     return message.type === 'message' && 'status' in message.message && 'task_id' in message.message;
 }
-export function isServerVariableMessage(message) {
-    return message.type === 'message' && '__type' in message.message && message.message.__type === 'ServerVariable';
+function isServerTriggerMessage(message) {
+    return message.type === 'message' && 'data_id' in message.message;
 }
-export function isServerErrorMessage(message) {
+function isServerErrorMessage(message) {
     return message.type === 'message' && 'error' in message.message;
 }
-export function isVariableRequestMessage(message) {
+function isVariableRequestMessage(message) {
     return message.type === 'message' && 'variable' in message.message;
 }
-export function isActionMessage(message) {
+function isActionMessage(message) {
     return message.type === 'message' && 'action' in message.message;
 }
-export function isBackendStoreMessage(message) {
+function isBackendStoreMessage(message) {
     return message.type === 'message' && 'store_uid' in message.message && 'value' in message.message;
 }
-export function isBackendStorePatchMessage(message) {
+function isBackendStorePatchMessage(message) {
     return message.type === 'message' && 'store_uid' in message.message && 'patches' in message.message;
 }
-export function isCustomMessage(message) {
+function isCustomMessage(message) {
     return message.type === 'custom';
 }
 const pingMessage = {
@@ -187,9 +174,6 @@ export class WebSocketClient {
     backendStorePatchMessages$() {
         return this.messages$.pipe(filter(isBackendStorePatchMessage), map((msg) => msg.message));
     }
-    serverVariableMessages$() {
-        return this.messages$.pipe(filter(isServerVariableMessage), map((msg) => msg.message));
-    }
     /**
      * Get the observable to receive the new channel when the socket reconnects
      */
@@ -214,6 +198,14 @@ export class WebSocketClient {
             msg.message.status === TaskStatus.PROGRESS &&
             task_ids.includes(msg.message.task_id)));
     }
+    /**
+     * Get the observable to receive server trigger messages for a given data variable
+     *
+     * @param dataId id of the data variable triggered
+     */
+    serverTriggers$(dataId) {
+        return this.messages$.pipe(filter(isServerTriggerMessage), filter((msg) => { var _a; return ((_a = msg.message) === null || _a === void 0 ? void 0 : _a.data_id) === dataId; }));
+    }
     /**
      * Get the observable to receive server error messages
      */
@@ -241,7 +233,7 @@ export class WebSocketClient {
         return this.messages$.pipe(filter(isCustomMessage));
     }
     /**
-     * Returns a promise that will resolve when the task is completed. If the task is cancelled or errored then this will throw an
+     * Returns a promise that will resolve when the task is completed. If the task is cancelled then this will throw an
      * error to signify that.
      *
      * @param task_id the id of the task to wait for
@@ -250,15 +242,13 @@ export class WebSocketClient {
         return this.messages$
             .pipe(filter((msg) => {
             var _a;
-            return (isTaskNotification(msg) &&
+            return isTaskNotification(msg) &&
                 ((_a = msg.message) === null || _a === void 0 ? void 0 : _a.task_id) === task_id &&
-                msg.message.status !== TaskStatus.PROGRESS); // don't take progress updates
-        }), map((msg) => {
-            if (msg.message.status === TaskStatus.CANCELED) {
-                throw new TaskCancelledError('Task was cancelled', msg.message.task_id);
-            }
-            else if (msg.message.status === TaskStatus.ERROR) {
-                throw new TaskError(msg.message.error, msg.message.task_id);
+                msg.message.status !== TaskStatus.PROGRESS;
+        } // don't take progress updates
+        ), map((msg) => {
+            if (isTaskNotification(msg) && msg.message.status === TaskStatus.CANCELED) {
+                throw new Error('CANCELED');
             }
             return msg;
         }), take(1))