@darajs/core 1.6.3 → 1.7.0

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

@@ -12003,6 +12003,8 @@ var __privateSet = (obj, member, value, setter) => {
     RecoilURLSyncTransit: RecoilURLSyncTransit$1,
     urlSyncEffect: urlSyncEffect$1
   };
+  var RecoilSync_index_1 = RecoilSync_index.RecoilSync;
+  var RecoilSync_index_2 = RecoilSync_index.syncEffect;
   var RecoilSync_index_3 = RecoilSync_index.RecoilURLSync;
   var RecoilSync_index_6 = RecoilSync_index.urlSyncEffect;
   const theme = {
@@ -54082,7 +54084,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       __publicField(this, "extras");
       this.extras = extras;
     }
-    toJSON() {
+    toSerializable() {
       var _a;
       if (!this.extras) {
         return null;
@@ -54095,6 +54097,13 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
         const headers = new Headers(serializable.options.headers);
         serializable.options.headers = Object.fromEntries(headers.entries());
       }
+      return serializable;
+    }
+    toJSON() {
+      const serializable = this.toSerializable();
+      if (!serializable) {
+        return null;
+      }
       return JSON.stringify(serializable);
     }
   }
@@ -55436,6 +55445,9 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   function isActionMessage(message) {
     return message.type === "message" && "action" in message.message;
   }
+  function isBackendStoreMessage(message) {
+    return message.type === "message" && "store_uid" in message.message;
+  }
   function isCustomMessage(message) {
     return message.type === "custom";
   }
@@ -55541,6 +55553,12 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     getChannel() {
       return this.channel;
     }
+    backendStoreMessages$() {
+      return this.messages$.pipe(
+        filter(isBackendStoreMessage),
+        map$2((msg) => msg.message)
+      );
+    }
     channel$() {
       return this.messages$.pipe(
         filter((msg) => isInitMessage(msg)),
@@ -55562,17 +55580,18 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     }
     serverTriggers$(dataId) {
       return this.messages$.pipe(
+        filter(isServerTriggerMessage),
         filter((msg) => {
           var _a;
-          return isServerTriggerMessage(msg) && ((_a = msg.message) == null ? void 0 : _a.data_id) === dataId;
+          return ((_a = msg.message) == null ? void 0 : _a.data_id) === dataId;
         })
       );
     }
     serverErrors$() {
-      return this.messages$.pipe(filter((msg) => isServerErrorMessage(msg)));
+      return this.messages$.pipe(filter(isServerErrorMessage));
     }
     variableRequests$() {
-      return this.messages$.pipe(filter((msg) => isVariableRequestMessage(msg)));
+      return this.messages$.pipe(filter(isVariableRequestMessage));
     }
     actionMessages$(executionId) {
       return this.messages$.pipe(
@@ -55581,7 +55600,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       );
     }
     customMessages$() {
-      return this.messages$.pipe(filter((msg) => isCustomMessage(msg)));
+      return this.messages$.pipe(filter(isCustomMessage));
     }
     waitForTask(task_id) {
       return this.messages$.pipe(
@@ -55643,149 +55662,6 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     setupHeartbeat();
     return new WebSocketClient(socket, sessionToken, liveReload);
   }
-  function getSessionKey(extras, uid2) {
-    const sessionToken = typeof extras === "string" ? extras : extras.sessionToken;
-    if (isEmbedded()) {
-      return `dara-session-${window.frameElement.dataset.daraPageId}-var-${uid2}`;
-    }
-    return `dara-session-${sessionToken}-var-${uid2}`;
-  }
-  const _StateSynchronizer = class {
-    constructor() {
-      __privateAdd(this, _listenersMap, /* @__PURE__ */ new Map());
-    }
-    static getInstance() {
-      if (!__privateGet(_StateSynchronizer, _instance)) {
-        __privateSet(_StateSynchronizer, _instance, new _StateSynchronizer());
-      }
-      return __privateGet(_StateSynchronizer, _instance);
-    }
-    subscribe(key, listener2) {
-      if (!__privateGet(this, _listenersMap).has(key)) {
-        __privateGet(this, _listenersMap).set(key, /* @__PURE__ */ new Set());
-      }
-      __privateGet(this, _listenersMap).get(key).add(listener2);
-      return () => {
-        __privateGet(this, _listenersMap).get(key).delete(listener2);
-      };
-    }
-    notify(key, ...args) {
-      var _a;
-      (_a = __privateGet(this, _listenersMap).get(key)) == null ? void 0 : _a.forEach((listener2) => listener2(...args));
-    }
-  };
-  let StateSynchronizer = _StateSynchronizer;
-  _instance = new WeakMap();
-  _listenersMap = new WeakMap();
-  __privateAdd(StateSynchronizer, _instance, void 0);
-  function getOrRegisterPlainVariable(variable, wsClient, taskContext, extras) {
-    const isNested = variable.nested && variable.nested.length > 0;
-    const isDefaultDerived = isDerivedVariable(variable.default);
-    let atomInstance;
-    let family = null;
-    if (isDefaultDerived) {
-      if (!atomFamilyRegistry.has(variable.uid)) {
-        atomFamilyRegistry.set(
-          variable.uid,
-          Recoil_index_10({
-            default: (extrasSerializable2) => getOrRegisterDerivedVariableValue(
-              variable.default,
-              wsClient,
-              taskContext,
-              extrasSerializable2.extras
-            ),
-            effects: [
-              ({ onSet, setSelf, resetSelf }) => {
-                const unsub = StateSynchronizer.getInstance().subscribe(
-                  variable.uid,
-                  (newValue, oldValue, isReset) => {
-                    if (isReset) {
-                      resetSelf();
-                    } else {
-                      setSelf(newValue);
-                    }
-                  }
-                );
-                onSet((newValue, oldValue, isReset) => {
-                  StateSynchronizer.getInstance().notify(variable.uid, newValue, oldValue, isReset);
-                });
-                return () => unsub();
-              }
-            ],
-            key: variable.uid
-          })
-        );
-      }
-      family = atomFamilyRegistry.get(variable.uid);
-      const extrasSerializable = new RequestExtrasSerializable(extras);
-      atomInstance = family(extrasSerializable);
-      if (!atomFamilyMembersRegistry.has(family)) {
-        atomFamilyMembersRegistry.set(family, /* @__PURE__ */ new Map());
-      }
-      atomFamilyMembersRegistry.get(family).set(extrasSerializable.toJSON(), atomInstance);
-    } else {
-      if (!atomRegistry.has(variable.uid)) {
-        let defaultValue = variable.default;
-        const persistValue = variable.persist_value || isEmbedded();
-        if (persistValue) {
-          const persistedValue = localStorage.getItem(getSessionKey(extras, variable.uid));
-          if (persistedValue) {
-            defaultValue = JSON.parse(persistedValue);
-          }
-        }
-        atomRegistry.set(
-          variable.uid,
-          Recoil_index_8({
-            default: defaultValue,
-            effects: persistValue ? [
-              ({ onSet }) => {
-                onSet((newValue) => {
-                  localStorage.setItem(
-                    getSessionKey(extras, variable.uid),
-                    JSON.stringify(newValue)
-                  );
-                });
-              }
-            ] : [],
-            key: variable.uid
-          })
-        );
-      }
-      atomInstance = atomRegistry.get(variable.uid);
-    }
-    if (isNested) {
-      const key = getRegistryKey(variable, "selector");
-      if (!selectorFamilyRegistry.has(key)) {
-        selectorFamilyRegistry.set(
-          key,
-          Recoil_index_11({
-            get: (extrasSerializable2) => ({ get: get2 }) => {
-              const variableValue = get2(family ? family(extrasSerializable2) : atomInstance);
-              return resolveNested(
-                variableValue,
-                variable.nested.map((n2) => String(n2))
-              );
-            },
-            key,
-            set: (extrasSerializable2) => ({ set: set2 }, newValue) => {
-              set2(
-                family ? family(extrasSerializable2) : atomInstance,
-                (v2) => setNested(
-                  v2,
-                  variable.nested.map((n2) => String(n2)),
-                  newValue
-                )
-              );
-            }
-          })
-        );
-      }
-      const selectorFamilyInstance = selectorFamilyRegistry.get(key);
-      const extrasSerializable = new RequestExtrasSerializable(extras);
-      return selectorFamilyInstance(extrasSerializable);
-    }
-    return atomInstance;
-  }
   function err(message) {
     const error = new Error(message);
     if (error.stack === void 0) {
@@ -56447,6 +56323,278 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     writableObject: writableObject$1
   };
   var Refine_index_6 = Refine_index.mixed;
+  function BackendStoreSync({ children }) {
+    const { client } = React__namespace.useContext(websocketCtx);
+    const extras = useRequestExtras();
+    const getStoreValue = React__namespace.useCallback(
+      async (itemKey) => {
+        const response = await request(`/api/core/store/${itemKey}`, {}, extras);
+        await handleAuthErrors(response, true);
+        await validateResponse(response, `Failed to fetch the store value for key: ${itemKey}`);
+        const val = await response.json();
+        return val;
+      },
+      [extras]
+    );
+    const syncStoreValues = React__namespace.useCallback(async ({ diff }) => {
+      const extrasMap = /* @__PURE__ */ new Map();
+      for (const [encodedKey, value] of diff.entries()) {
+        const { serializedExtras, store_uid } = JSON.parse(encodedKey);
+        if (!extrasMap.has(serializedExtras)) {
+          extrasMap.set(serializedExtras, {});
+        }
+        extrasMap.get(serializedExtras)[store_uid] = value;
+      }
+      async function sendRequest(serializedExtras, storeDiff) {
+        const response = await request(
+          `/api/core/store`,
+          { body: JSON.stringify(storeDiff), method: "POST" },
+          JSON.parse(serializedExtras)
+        );
+        await handleAuthErrors(response, true);
+        await validateResponse(response, `Failed to sync the store values`);
+      }
+      await Promise.allSettled(
+        Array.from(extrasMap.entries()).map(
+          ([serializedExtras, storeDiff]) => sendRequest(serializedExtras, storeDiff)
+        )
+      );
+    }, []);
+    const listenToStoreChanges = React__namespace.useCallback(
+      ({ updateItem }) => {
+        if (!client) {
+          return;
+        }
+        const sub = client.backendStoreMessages$().subscribe((message) => {
+          updateItem(message.store_uid, message.value);
+        });
+        return () => sub.unsubscribe();
+      },
+      [client]
+    );
+    return /* @__PURE__ */ React__namespace.createElement(RecoilSync_index_1, { listen: listenToStoreChanges, read: getStoreValue, storeKey: "BackendStore", write: syncStoreValues }, children);
+  }
+  function backendStoreEffect(variable, requestExtras) {
+    return RecoilSync_index_2({
+      itemKey: variable.store.uid,
+      refine: Refine_index_6(),
+      storeKey: "BackendStore",
+      write: ({ write: write2 }, newValue) => {
+        write2(
+          JSON.stringify({
+            serializedExtras: requestExtras.toJSON(),
+            store_uid: variable.store.uid
+          }),
+          newValue
+        );
+      }
+    });
+  }
+  function getSessionKey(extras, uid2) {
+    const sessionToken = typeof extras === "string" ? extras : extras.sessionToken;
+    if (isEmbedded()) {
+      return `dara-session-${window.frameElement.dataset.daraPageId}-var-${uid2}`;
+    }
+    return `dara-session-${sessionToken}-var-${uid2}`;
+  }
+  function BrowserStoreSync({ children }) {
+    const extras = useRequestExtras();
+    const getStoreValue = React__namespace.useCallback(
+      (itemKey) => {
+        var _a;
+        const key = getSessionKey(extras, itemKey);
+        return JSON.parse((_a = localStorage.getItem(key)) != null ? _a : "null");
+      },
+      [extras]
+    );
+    const syncStoreValues = React__namespace.useCallback(
+      ({ diff }) => {
+        for (const [itemKey, value] of diff.entries()) {
+          const key = getSessionKey(extras, itemKey);
+          localStorage.setItem(key, JSON.stringify(value));
+        }
+      },
+      [extras]
+    );
+    const listenToStoreChanges = React__namespace.useCallback(
+      ({ updateItem }) => {
+        const listener2 = (e3) => {
+          var _a;
+          if (e3.storageArea === localStorage) {
+            if (e3.key) {
+              const match2 = e3.key.match(/^dara-session-(.*)-var-(.*)$/);
+              if (match2) {
+                const [, sessionToken, uid2] = match2;
+                if (typeof extras === "string" && sessionToken === extras || typeof extras === "object" && extras.sessionToken === sessionToken) {
+                  updateItem(uid2, JSON.parse((_a = e3.newValue) != null ? _a : "null"));
+                }
+              }
+            }
+          }
+        };
+        window.addEventListener("storage", listener2);
+        return () => {
+          window.removeEventListener("storage", listener2);
+        };
+      },
+      [extras]
+    );
+    return /* @__PURE__ */ React__namespace.createElement(RecoilSync_index_1, { listen: listenToStoreChanges, read: getStoreValue, storeKey: "BrowserStore", write: syncStoreValues }, children);
+  }
+  function localStorageEffect(variable) {
+    let firstRun = false;
+    return RecoilSync_index_2({
+      itemKey: variable.uid,
+      read: ({ read: read2 }) => {
+        const readValue = read2(variable.uid);
+        if (!firstRun) {
+          firstRun = true;
+          if (!readValue) {
+            return variable.default;
+          }
+        }
+        return readValue;
+      },
+      refine: Refine_index_6(),
+      storeKey: "BrowserStore"
+    });
+  }
+  const STORES = {
+    BackendStore: {
+      effect: backendStoreEffect,
+      sync: BackendStoreSync
+    },
+    BrowserStore: {
+      effect: localStorageEffect,
+      sync: BrowserStoreSync
+    }
+  };
+  function getEffect(variable) {
+    var _a, _b;
+    const storeName = (_a = variable.store) == null ? void 0 : _a.__typename;
+    if (!storeName) {
+      return null;
+    }
+    return (_b = STORES[storeName].effect) != null ? _b : null;
+  }
+  function StoreProviders({ children }) {
+    return /* @__PURE__ */ React__namespace.createElement(BackendStoreSync, null, /* @__PURE__ */ React__namespace.createElement(BrowserStoreSync, null, children));
+  }
+  const _StateSynchronizer = class {
+    constructor() {
+      __privateAdd(this, _listenersMap, /* @__PURE__ */ new Map());
+    }
+    static getInstance() {
+      if (!__privateGet(_StateSynchronizer, _instance)) {
+        __privateSet(_StateSynchronizer, _instance, new _StateSynchronizer());
+      }
+      return __privateGet(_StateSynchronizer, _instance);
+    }
+    subscribe(key, listener2) {
+      if (!__privateGet(this, _listenersMap).has(key)) {
+        __privateGet(this, _listenersMap).set(key, /* @__PURE__ */ new Set());
+      }
+      __privateGet(this, _listenersMap).get(key).add(listener2);
+      return () => {
+        __privateGet(this, _listenersMap).get(key).delete(listener2);
+      };
+    }
+    notify(key, ...args) {
+      var _a;
+      (_a = __privateGet(this, _listenersMap).get(key)) == null ? void 0 : _a.forEach((listener2) => listener2(...args));
+    }
+  };
+  let StateSynchronizer = _StateSynchronizer;
+  _instance = new WeakMap();
+  _listenersMap = new WeakMap();
+  __privateAdd(StateSynchronizer, _instance, void 0);
+  function getOrRegisterPlainVariable(variable, wsClient, taskContext, extras) {
+    const isNested = variable.nested && variable.nested.length > 0;
+    const isDefaultDerived = isDerivedVariable(variable.default);
+    if (!atomFamilyRegistry.has(variable.uid)) {
+      atomFamilyRegistry.set(
+        variable.uid,
+        Recoil_index_10({
+          default: isDefaultDerived ? (extrasSerializable2) => getOrRegisterDerivedVariableValue(
+            variable.default,
+            wsClient,
+            taskContext,
+            extrasSerializable2.extras
+          ) : variable.default,
+          effects: (extrasSerializable2) => {
+            const familySync = ({ onSet, setSelf, resetSelf, node }) => {
+              const unsub = StateSynchronizer.getInstance().subscribe(
+                variable.uid,
+                (nodeKey, newValue, oldValue, isReset) => {
+                  if (nodeKey === node.key) {
+                    return;
+                  }
+                  if (isReset) {
+                    resetSelf();
+                  } else {
+                    setSelf(newValue);
+                  }
+                }
+              );
+              onSet((newValue, oldValue, isReset) => {
+                StateSynchronizer.getInstance().notify(variable.uid, node.key, newValue, oldValue, isReset);
+              });
+              return () => unsub();
+            };
+            const effects = [familySync];
+            const storeEffect = getEffect(variable);
+            if (storeEffect) {
+              effects.push(storeEffect(variable, extrasSerializable2));
+            } else {
+              if (variable.persist_value || isEmbedded()) {
+                effects.push(STORES.BrowserStore.effect(variable, extrasSerializable2));
+              }
+            }
+            return effects;
+          },
+          key: variable.uid
+        })
+      );
+    }
+    const family = atomFamilyRegistry.get(variable.uid);
+    const extrasSerializable = new RequestExtrasSerializable(extras);
+    const atomInstance = family(extrasSerializable);
+    if (!atomFamilyMembersRegistry.has(family)) {
+      atomFamilyMembersRegistry.set(family, /* @__PURE__ */ new Map());
+    }
+    atomFamilyMembersRegistry.get(family).set(extrasSerializable.toJSON(), atomInstance);
+    if (isNested) {
+      const key = getRegistryKey(variable, "selector");
+      if (!selectorFamilyRegistry.has(key)) {
+        selectorFamilyRegistry.set(
+          key,
+          Recoil_index_11({
+            get: (currentExtras) => ({ get: get2 }) => {
+              const variableValue = get2(family ? family(currentExtras) : atomInstance);
+              return resolveNested(
+                variableValue,
+                variable.nested.map((n2) => String(n2))
+              );
+            },
+            key,
+            set: (currentExtras) => ({ set: set2 }, newValue) => {
+              set2(
+                family ? family(currentExtras) : atomInstance,
+                (v2) => setNested(
+                  v2,
+                  variable.nested.map((n2) => String(n2)),
+                  newValue
+                )
+              );
+            }
+          })
+        );
+      }
+      const selectorFamilyInstance = selectorFamilyRegistry.get(key);
+      return selectorFamilyInstance(extrasSerializable);
+    }
+    return atomInstance;
+  }
   function getOrRegisterUrlVariable(variable) {
     if (!atomRegistry.has(variable.uid)) {
       atomRegistry.set(
@@ -59123,7 +59271,7 @@ Inferred class string: "${iconClasses}."`
       {
         value: { actionRegistry: actions, componentRegistry: components, refetchComponents }
       },
-      /* @__PURE__ */ React__default.default.createElement(GlobalTaskProvider, null, /* @__PURE__ */ React__default.default.createElement(DynamicContext, { contextComponents: (_c = config2 == null ? void 0 : config2.context_components) != null ? _c : [] }, /* @__PURE__ */ React__default.default.createElement(RootWrapper, null, /* @__PURE__ */ React__default.default.createElement(DynamicComponent, { component: template == null ? void 0 : template.layout }), /* @__PURE__ */ React__default.default.createElement(VariableStateProvider, { wsClient }), (config2 == null ? void 0 : config2.enable_devtools) && /* @__PURE__ */ React__default.default.createElement(DevTools, null))))
+      /* @__PURE__ */ React__default.default.createElement(GlobalTaskProvider, null, /* @__PURE__ */ React__default.default.createElement(DynamicContext, { contextComponents: (_c = config2 == null ? void 0 : config2.context_components) != null ? _c : [] }, /* @__PURE__ */ React__default.default.createElement(StoreProviders, null, /* @__PURE__ */ React__default.default.createElement(RootWrapper, null, /* @__PURE__ */ React__default.default.createElement(DynamicComponent, { component: template == null ? void 0 : template.layout }), /* @__PURE__ */ React__default.default.createElement(VariableStateProvider, { wsClient }), (config2 == null ? void 0 : config2.enable_devtools) && /* @__PURE__ */ React__default.default.createElement(DevTools, null)))))
     )));
   }
   const Wrapper$1 = styled__default.default.div`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darajs/core",
-  "version": "1.6.3",
+  "version": "1.7.0",
   "description": "Dara Framework core",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -35,9 +35,9 @@
     "@babel/preset-env": "^7.23.0",
     "@babel/preset-react": "^7.22.15",
     "@babel/preset-typescript": "^7.23.0",
-    "@darajs/eslint-config": "~1.5.2",
-    "@darajs/prettier-config": "~1.5.2",
-    "@darajs/stylelint-config": "~1.5.2",
+    "@darajs/eslint-config": "~1.6.0",
+    "@darajs/prettier-config": "~1.6.0",
+    "@darajs/stylelint-config": "~1.6.0",
     "@rollup/plugin-inject": "^4.0.4",
     "@testing-library/dom": "^9.3.0",
     "@testing-library/jest-dom": "^5.16.5",
@@ -64,7 +64,7 @@
     "jest-css-modules": "^2.1.0",
     "jest-environment-jsdom": "^29.5.0",
     "msw": "1.0.1",
-    "postcss": "^8.4.30",
+    "postcss": "^8.4.35",
     "react-test-renderer": "^17.0.2",
     "rimraf": "^3.0.2",
     "start-server-and-test": "^1.14.0",
@@ -74,10 +74,10 @@
     "whatwg-fetch": "^3.6.2"
   },
   "dependencies": {
-    "@darajs/styled-components": "~1.5.2",
-    "@darajs/ui-components": "~1.5.2",
-    "@darajs/ui-notifications": "~1.5.2",
-    "@darajs/ui-utils": "~1.5.2",
+    "@darajs/styled-components": "~1.6.0",
+    "@darajs/ui-components": "~1.6.0",
+    "@darajs/ui-notifications": "~1.6.0",
+    "@darajs/ui-utils": "~1.6.0",
     "@fortawesome/fontawesome-free": "~6.4.0",
     "@recoiljs/refine": "^0.1.1",
     "@tanstack/query-core": "^4.0.0",
@@ -113,5 +113,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c06ba3562f04a8aa5d1ad018c9f371d09613f45d"
+  "gitHead": "7d1a18c0819739d83ba315a0882f244df84648ec"
 }