@darajs/core 1.17.6 → 1.18.0

package/dist/umd/dara.core.umd.js

@@ -52950,13 +52950,107 @@ Inferred class string: "${iconClasses}."`
       atomRegistry.set(variable.uid, Recoil_index_8({ default: true, key: variable.uid }));
     }
   }
+  var baseSet = _baseSet;
+  function set(object2, path, value) {
+    return object2 == null ? object2 : baseSet(object2, path, value);
+  }
+  var set_1 = set;
+  function getOrRegisterTrigger(variable) {
+    const triggerKey = getRegistryKey(variable, "trigger");
+    if (!atomRegistry.has(triggerKey)) {
+      atomRegistry.set(
+        triggerKey,
+        Recoil_index_8({
+          default: {
+            force_key: null,
+            inc: 0
+          },
+          key: triggerKey
+        })
+      );
+    }
+    return atomRegistry.get(triggerKey);
+  }
+  function getOrRegisterDataVariableTrigger(variable, wsClient) {
+    const key = `${variable.uid}-data`;
+    if (!dataRegistry.has(key)) {
+      dataRegistry.set(
+        key,
+        Recoil_index_8({
+          default: {
+            force_key: null,
+            inc: 0
+          },
+          effects: [
+            ({ setSelf }) => {
+              const subscription = wsClient.serverTriggers$(variable.uid).subscribe(() => {
+                setSelf((v2) => {
+                  if (typeof v2 === "object" && "inc" in v2) {
+                    return {
+                      force_key: nanoid(),
+                      inc: v2.inc + 1
+                    };
+                  }
+                  return {
+                    force_key: nanoid(),
+                    inc: 1
+                  };
+                });
+              });
+              return () => {
+                subscription == null ? void 0 : subscription.unsubscribe();
+              };
+            }
+          ],
+          key
+        })
+      );
+    }
+    return dataRegistry.get(key);
+  }
+  function buildTriggerList(variables) {
+    const triggers = [];
+    function walk(vars, path) {
+      for (const [idx, variable] of vars.entries()) {
+        if (isDerivedVariable(variable) || isDerivedDataVariable(variable)) {
+          const varPath = [...path, String(idx)];
+          triggers.push({
+            path: varPath,
+            variable
+          });
+          walk(variable.variables, [...varPath, "values"]);
+        }
+        if (isDataVariable(variable)) {
+          triggers.push({
+            path: path.length > 0 ? path.slice(0, -1) : [],
+            variable
+          });
+        }
+      }
+    }
+    walk(variables, []);
+    return triggers;
+  }
+  function registerChildTriggers(triggerList, wsClient, registerFunc = Recoil_index_20) {
+    return triggerList.map((triggerInfo) => {
+      if (isDerivedVariable(triggerInfo.variable) || isDerivedDataVariable(triggerInfo.variable)) {
+        const triggerIndex = getOrRegisterTrigger(triggerInfo.variable);
+        return registerFunc(triggerIndex);
+      }
+      if (isDataVariable(triggerInfo.variable)) {
+        const serverTrigger = getOrRegisterDataVariableTrigger(triggerInfo.variable, wsClient);
+        return registerFunc(serverTrigger);
+      }
+      throw new Error("Invalid trigger variable type");
+    });
+  }
   function isTaskResponse$1(dvResponse) {
     return "task_id" in dvResponse;
   }
   async function fetchDerivedVariable({
     cache: cache2,
-    force,
     extras,
+    force_key,
     variableUid,
     values,
     wsClient,
@@ -52969,7 +53063,7 @@ Inferred class string: "${iconClasses}."`
     const res = await 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 : null }),
         headers: { ...cacheControl },
         method: HTTP_METHOD.POST
       },
@@ -52986,9 +53080,9 @@ Inferred class string: "${iconClasses}."`
     selectorKey,
     values,
     wsClient,
-    force,
     extras,
     cache: cache2,
+    force_key,
     is_data_variable = false
   }) {
     if (!debouncedFetchSubjects[selectorKey]) {
@@ -53003,7 +53097,7 @@ Inferred class string: "${iconClasses}."`
     debouncedFetchSubjects[selectorKey].next({
       cache: cache2,
       extras,
-      force,
+      force_key,
       is_data_variable,
       selectorKey,
       values,
@@ -53061,8 +53155,9 @@ Inferred class string: "${iconClasses}."`
   function useTriggerIndex(variable) {
     return Recoil_index_20(getOrRegisterTrigger(variable));
   }
-  async function resolveDerivedValue(key, variables, deps, resolvedVariables, wsClient, get2, selfTrigger) {
-    const triggers = registerChildTriggers(variables, wsClient, get2);
+  function resolveDerivedValue(key, variables, deps, resolvedVariables, wsClient, get2, selfTrigger) {
+    const triggerList = buildTriggerList(variables);
+    const triggers = registerChildTriggers(triggerList, wsClient, get2);
     if (selfTrigger) {
       triggers.unshift(selfTrigger);
     }
@@ -53074,9 +53169,6 @@ Inferred class string: "${iconClasses}."`
       }
       return acc.set(getUniqueIdentifier(v2), depsValues[idx]);
     }, /* @__PURE__ */ new Map());
-    let recalculateForced = false;
-    let wasTriggered = false;
-    let wasTriggeredItself = false;
     const previousEntry = depsRegistry.get(key);
     const relevantValues = deps.filter(isVariable).map((dep) => variableValueMap.get(getUniqueIdentifier(dep))).concat(triggers.map((trigger) => trigger.inc));
     if (previousEntry) {
@@ -53090,23 +53182,33 @@ Inferred class string: "${iconClasses}."`
       const previousTriggerCounters = previousEntry.args.slice(
         previousEntry.args.length - triggers.length
       );
+      let selfTriggerForceKey = null;
       for (const [idx, triggerValue] of triggers.entries()) {
         if (triggerValue.inc !== previousTriggerCounters[idx]) {
-          recalculateForced = triggerValue.force;
-          if (idx === 0) {
-            wasTriggeredItself = true;
+          if (selfTrigger && idx === 0) {
+            selfTriggerForceKey = triggerValue.force_key;
+          } else if (triggerValue.force_key) {
+            const valueIndex = selfTrigger ? idx - 1 : idx;
+            const triggerInfo = triggerList[valueIndex];
+            if (triggerInfo.path.length === 0) {
+              selfTriggerForceKey = triggerValue.force_key;
+            } else {
+              set_1(values, [...triggerInfo.path, "force_key"], triggerValue.force_key);
+            }
           }
-          wasTriggered = true;
           break;
         }
       }
-    }
-    if (wasTriggered && !wasTriggeredItself) {
-      await new Promise((resolve) => setTimeout(resolve, 50));
+      return {
+        relevantValues,
+        selfTriggerForceKey,
+        type: "current",
+        values
+      };
     }
     return {
-      force: recalculateForced,
       relevantValues,
+      selfTriggerForceKey: null,
       type: "current",
       values
     };
@@ -53131,7 +53233,7 @@ Inferred class string: "${iconClasses}."`
             const selfTrigger = get2(getOrRegisterTrigger(variable));
             const { extras } = extrasSerializable;
             const selectorKey = key + extrasSerializable.toJSON();
-            const derivedResult = await resolveDerivedValue(
+            const derivedResult = resolveDerivedValue(
               selectorKey,
               variable.variables,
               variable.deps,
@@ -53148,10 +53250,10 @@ Inferred class string: "${iconClasses}."`
               variableResponse = await 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
               });
@@ -53246,7 +53348,10 @@ Inferred class string: "${iconClasses}."`
     const triggerIndex = React.useMemo(() => getOrRegisterTrigger(variable), []);
     const triggerUpdates = Recoil_index_24(triggerIndex);
     const trigger = React.useCallback(
-      (force = true) => triggerUpdates((val) => ({ force, inc: val.inc + 1 })),
+      (force = true) => triggerUpdates((val) => ({
+        force_key: force ? nanoid() : null,
+        inc: val.inc + 1
+      })),
       [triggerUpdates]
     );
     useInterval(trigger, variable.polling_interval);
@@ -53289,87 +53394,6 @@ Inferred class string: "${iconClasses}."`
     cloned[key] = nested.length === 1 ? newValue : setNested(cloned[key], nested.slice(1), newValue);
     return cloned;
   }
-  function getOrRegisterTrigger(variable) {
-    const triggerKey = getRegistryKey(variable, "trigger");
-    if (!atomRegistry.has(triggerKey)) {
-      atomRegistry.set(
-        triggerKey,
-        Recoil_index_8({
-          default: {
-            force: false,
-            inc: 0
-          },
-          key: triggerKey
-        })
-      );
-    }
-    return atomRegistry.get(triggerKey);
-  }
-  function getOrRegisterDataVariableTrigger(variable, wsClient) {
-    const key = `${variable.uid}-data`;
-    if (!dataRegistry.has(key)) {
-      dataRegistry.set(
-        key,
-        Recoil_index_8({
-          default: {
-            force: true,
-            inc: 0
-          },
-          effects: [
-            ({ setSelf }) => {
-              const subscription = wsClient.serverTriggers$(variable.uid).subscribe(() => {
-                setSelf((v2) => {
-                  if (typeof v2 === "object" && "inc" in v2) {
-                    return {
-                      force: true,
-                      inc: v2.inc + 1
-                    };
-                  }
-                  return {
-                    force: true,
-                    inc: 1
-                  };
-                });
-              });
-              return () => {
-                subscription == null ? void 0 : subscription.unsubscribe();
-              };
-            }
-          ],
-          key
-        })
-      );
-    }
-    return dataRegistry.get(key);
-  }
-  function registerTriggers(variable, wsClient, registerFunc = Recoil_index_20) {
-    const triggers = [];
-    const triggerIndex = getOrRegisterTrigger(variable);
-    triggers.push(registerFunc(triggerIndex));
-    variable.variables.forEach((v2) => {
-      if (isDerivedVariable(v2) || isDerivedDataVariable(v2)) {
-        triggers.push(...registerTriggers(v2, wsClient, registerFunc));
-      }
-      if (isDataVariable(v2)) {
-        const serverTrigger = getOrRegisterDataVariableTrigger(v2, wsClient);
-        triggers.push(registerFunc(serverTrigger));
-      }
-    });
-    return triggers;
-  }
-  function registerChildTriggers(variables, wsClient, registerFunc = Recoil_index_20) {
-    const triggers = [];
-    variables.forEach((v2) => {
-      if (isDerivedVariable(v2) || isDerivedDataVariable(v2)) {
-        triggers.push(...registerTriggers(v2, wsClient, registerFunc));
-      }
-      if (isDataVariable(v2)) {
-        const serverTrigger = getOrRegisterDataVariableTrigger(v2, wsClient);
-        triggers.push(registerFunc(serverTrigger));
-      }
-    });
-    return triggers;
-  }
   function resolveVariable(variable, client, taskContext, extras, resolver = (val) => val) {
     if (isDerivedVariable(variable) || isDerivedDataVariable(variable)) {
       getOrRegisterDerivedVariable(variable, client, taskContext, extras);
@@ -53417,37 +53441,37 @@ Inferred class string: "${iconClasses}."`
     }
     return resolver(getOrRegisterPlainVariable(variable, client, taskContext, extras));
   }
-  function cleanValue(value, force) {
+  function cleanValue(value, forceKeyOverride) {
     if (isResolvedDerivedVariable(value) || isResolvedDerivedDataVariable(value)) {
       const { deps, ...rest } = value;
-      const cleanedValues = value.values.map((v2) => cleanValue(v2, force));
+      const cleanedValues = value.values.map((v2) => cleanValue(v2));
       return {
         ...rest,
-        force,
+        force_key: forceKeyOverride != null ? forceKeyOverride : value.force_key || null,
         values: cleanedValues
       };
     }
     if (isResolvedSwitchVariable(value)) {
       return {
         ...value,
-        value: cleanValue(value.value, force),
-        value_map: cleanValue(value.value_map, force),
-        default: cleanValue(value.default, force)
+        value: cleanValue(value.value, forceKeyOverride),
+        value_map: cleanValue(value.value_map, forceKeyOverride),
+        default: cleanValue(value.default, forceKeyOverride)
       };
     }
     return value;
   }
-  function cleanKwargs(kwargs, force) {
+  function cleanKwargs(kwargs, forceKeyOverride) {
     return Object.keys(kwargs).reduce(
       (acc, k2) => {
-        acc[k2] = cleanValue(kwargs[k2], force);
+        acc[k2] = cleanValue(kwargs[k2], forceKeyOverride);
         return acc;
       },
       {}
     );
   }
-  function cleanArgs(values, force) {
-    return values.map((val) => cleanValue(val, force));
+  function cleanArgs(values, forceKeyOverride) {
+    return values.map((val) => cleanValue(val, forceKeyOverride));
   }
   /*!
    * https://github.com/Starcounter-Jack/JSON-Patch
@@ -54707,7 +54731,7 @@ Inferred class string: "${iconClasses}."`
           execution_id: executionId,
           input,
           uid: annotatedAction.uid,
-          values: normalizeRequest(cleanKwargs(resolvedKwargs, false), annotatedAction.dynamic_kwargs),
+          values: normalizeRequest(cleanKwargs(resolvedKwargs, null), annotatedAction.dynamic_kwargs),
           ws_channel
         }),
         method: HTTP_METHOD.POST
@@ -55047,10 +55071,10 @@ Inferred class string: "${iconClasses}."`
     return fetchDerivedVariable({
       cache: variable.cache,
       extras: ctx.extras,
-      force: false,
+      force_key: null,
       selectorKey: resolved.uid,
       values: normalizeRequest(
-        cleanArgs(resolved.values, false),
+        cleanArgs(resolved.values),
         variable.variables
       ),
       variableUid: resolved.uid,
@@ -55382,7 +55406,7 @@ Inferred class string: "${iconClasses}."`
         triggerKey,
         Recoil_index_8({
           default: {
-            force: false,
+            force_key: null,
             inc: 0
           },
           key: triggerKey
@@ -55422,7 +55446,7 @@ Inferred class string: "${iconClasses}."`
             const triggerAtom = getOrRegisterComponentTrigger(uid2);
             const selfTrigger = get2(triggerAtom);
             const { extras } = extrasSerializable;
-            const derivedResult = await resolveDerivedValue(
+            const derivedResult = resolveDerivedValue(
               key,
               kwargsList,
               kwargsList,
@@ -55441,8 +55465,7 @@ Inferred class string: "${iconClasses}."`
                   return acc;
                 },
                 {}
-              ),
-              derivedResult.force
+              )
             );
             let result = null;
             try {
@@ -55535,7 +55558,7 @@ Inferred class string: "${iconClasses}."`
       ({ set: set2 }) => () => {
         const triggerAtom = getOrRegisterComponentTrigger(uid2, loop_instance_uid);
         set2(triggerAtom, (triggerIndexValue) => ({
-          force: false,
+          force_key: nanoid(),
           inc: triggerIndexValue.inc + 1
         }));
       },
@@ -55655,11 +55678,6 @@ Inferred class string: "${iconClasses}."`
     return typeof Ctor == "function" && Ctor instanceof Ctor && funcToString.call(Ctor) == objectCtorString;
   }
   var isPlainObject_1 = isPlainObject;
-  var baseSet = _baseSet;
-  function set(object2, path, value) {
-    return object2 == null ? object2 : baseSet(object2, path, value);
-  }
-  var set_1 = set;
   function createMarkers(scope, loopInstanceUid) {
     const markers = [];
     if (scope.action) {
@@ -56885,7 +56903,7 @@ Inferred class string: "${iconClasses}."`
       if (isDerivedVariable(variable) || isDerivedDataVariable(variable)) {
         const triggerAtom = getOrRegisterTrigger(variable);
         ctx.set(triggerAtom, (triggerIndexValue) => ({
-          force: true,
+          force_key: nanoid(),
           inc: triggerIndexValue.inc + 1
         }));
       } else if (isUrlVariable(variable)) {
@@ -56906,8 +56924,8 @@ Inferred class string: "${iconClasses}."`
   const TriggerVariable = (ctx, actionImpl) => {
     const triggerAtom = getOrRegisterTrigger(actionImpl.variable);
     ctx.set(triggerAtom, (triggerIndexValue) => ({
-      force: actionImpl.force,
-      inc: triggerIndexValue.inc + 1
+      inc: triggerIndexValue.inc + 1,
+      force_key: actionImpl.force ? nanoid() : null
     }));
   };
   const INPUT = "__dara_input__";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darajs/core",
-  "version": "1.17.6",
+  "version": "1.18.0",
   "description": "Dara Framework core",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -37,9 +37,9 @@
     "@babel/preset-env": "^7.23.0",
     "@babel/preset-react": "^7.22.15",
     "@babel/preset-typescript": "^7.23.0",
-    "@darajs/eslint-config": "1.17.6",
-    "@darajs/prettier-config": "1.17.6",
-    "@darajs/stylelint-config": "1.17.6",
+    "@darajs/eslint-config": "1.18.0",
+    "@darajs/prettier-config": "1.18.0",
+    "@darajs/stylelint-config": "1.18.0",
     "@rollup/plugin-inject": "^4.0.4",
     "@testing-library/dom": "^9.3.0",
     "@testing-library/jest-dom": "^5.16.5",
@@ -79,10 +79,10 @@
     "whatwg-fetch": "^3.6.2"
   },
   "dependencies": {
-    "@darajs/styled-components": "1.17.6",
-    "@darajs/ui-components": "1.17.6",
-    "@darajs/ui-notifications": "1.17.6",
-    "@darajs/ui-utils": "1.17.6",
+    "@darajs/styled-components": "1.18.0",
+    "@darajs/ui-components": "1.18.0",
+    "@darajs/ui-notifications": "1.18.0",
+    "@darajs/ui-utils": "1.18.0",
     "@fortawesome/fontawesome-free": "~6.4.0",
     "@recoiljs/refine": "^0.1.1",
     "@tanstack/query-core": "^4.0.0",
@@ -118,5 +118,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "73a42ef047e5ea0a69b71a073210b942edf495a3"
+  "gitHead": "69351e04bfd2d09e94ab94ede8df5475f1dfb981"
 }