ode-explorer 1.4.2-develop-pedago.202404181500 → 1.4.2-develop-pedago.202404181532

package/dist/index.js

@@ -34,7 +34,7 @@ var __privateMethod = (obj, member, method) => {
   __accessCheck(obj, member, "access private method");
   return method;
 };
-var _focused, _cleanup, _setup, _a, _online, _cleanup2, _setup2, _b, _gcTimeout, _c, _initialState, _revertState, _cache, _retryer, _observers, _defaultOptions, _abortSignalConsumed, _dispatch, dispatch_fn, _d, _queries, _e, _observers2, _defaultOptions2, _mutationCache, _retryer2, _dispatch2, dispatch_fn2, _f, _mutations, _mutationId, _resuming, _g, _queryCache, _mutationCache2, _defaultOptions3, _queryDefaults, _mutationDefaults, _mountCount, _unsubscribeFocus, _unsubscribeOnline, _h, _client, _currentQuery, _currentQueryInitialState, _currentResult, _currentResultState, _currentResultOptions, _selectError, _selectFn, _selectResult, _lastQueryWithDefinedData, _staleTimeoutId, _refetchIntervalId, _currentRefetchInterval, _trackedProps, _executeFetch, executeFetch_fn, _updateStaleTimeout, updateStaleTimeout_fn, _computeRefetchInterval, computeRefetchInterval_fn, _updateRefetchInterval, updateRefetchInterval_fn, _updateTimers, updateTimers_fn, _clearStaleTimeout, clearStaleTimeout_fn, _clearRefetchInterval, clearRefetchInterval_fn, _updateQuery, updateQuery_fn, _notify, notify_fn, _i, _client2, _currentResult2, _currentMutation, _mutateOptions, _updateResult, updateResult_fn, _notify2, notify_fn2, _j;
+var _focused, _cleanup, _setup, _a, _online, _cleanup2, _setup2, _b, _gcTimeout, _c, _initialState, _revertState, _cache, _promise, _retryer, _observers, _defaultOptions, _abortSignalConsumed, _setOptions, setOptions_fn, _dispatch, dispatch_fn, _d, _queries, _e, _observers2, _defaultOptions2, _mutationCache, _retryer2, _dispatch2, dispatch_fn2, _f, _mutations, _mutationId, _resuming, _g, _queryCache, _mutationCache2, _defaultOptions3, _queryDefaults, _mutationDefaults, _mountCount, _unsubscribeFocus, _unsubscribeOnline, _h, _client, _currentQuery, _currentQueryInitialState, _currentResult, _currentResultState, _currentResultOptions, _selectError, _selectFn, _selectResult, _lastQueryWithDefinedData, _staleTimeoutId, _refetchIntervalId, _currentRefetchInterval, _trackedProps, _executeFetch, executeFetch_fn, _updateStaleTimeout, updateStaleTimeout_fn, _computeRefetchInterval, computeRefetchInterval_fn, _updateRefetchInterval, updateRefetchInterval_fn, _updateTimers, updateTimers_fn, _clearStaleTimeout, clearStaleTimeout_fn, _clearRefetchInterval, clearRefetchInterval_fn, _updateQuery, updateQuery_fn, _notify, notify_fn, _i, _client2, _currentResult2, _currentMutation, _mutateOptions, _updateResult, updateResult_fn, _notify2, notify_fn2, _j;
 import { odeServices, FOLDER, SORT_ORDER, ACTION } from "/assets/js/edifice-ts-client/index.js";
 function _mergeNamespaces(n2, m2) {
   for (var i2 = 0; i2 < m2.length; i2++) {
@@ -4270,7 +4270,7 @@ var Subscribable = class {
   onUnsubscribe() {
   }
 };
-var isServer = typeof window === "undefined" || "Deno" in globalThis;
+var isServer = typeof window === "undefined" || "Deno" in window;
 function noop$2() {
   return void 0;
 }
@@ -4313,7 +4313,7 @@ function matchQuery(filters2, query) {
   if (typeof stale === "boolean" && query.isStale() !== stale) {
     return false;
   }
-  if (fetchStatus && fetchStatus !== query.state.fetchStatus) {
+  if (typeof fetchStatus !== "undefined" && fetchStatus !== query.state.fetchStatus) {
     return false;
   }
   if (predicate && !predicate(query)) {
@@ -4374,22 +4374,16 @@ function replaceEqualDeep(a2, b2) {
   }
   const array = isPlainArray(a2) && isPlainArray(b2);
   if (array || isPlainObject$1(a2) && isPlainObject$1(b2)) {
-    const aItems = array ? a2 : Object.keys(a2);
-    const aSize = aItems.length;
+    const aSize = array ? a2.length : Object.keys(a2).length;
     const bItems = array ? b2 : Object.keys(b2);
     const bSize = bItems.length;
     const copy2 = array ? [] : {};
     let equalItems = 0;
     for (let i2 = 0; i2 < bSize; i2++) {
       const key = array ? i2 : bItems[i2];
-      if (!array && a2[key] === void 0 && b2[key] === void 0 && aItems.includes(key)) {
-        copy2[key] = void 0;
+      copy2[key] = replaceEqualDeep(a2[key], b2[key]);
+      if (copy2[key] === a2[key]) {
         equalItems++;
-      } else {
-        copy2[key] = replaceEqualDeep(a2[key], b2[key]);
-        if (copy2[key] === a2[key] && a2[key] !== void 0) {
-          equalItems++;
-        }
       }
     }
     return aSize === bSize && equalItems === aSize ? a2 : copy2;
@@ -4397,7 +4391,7 @@ function replaceEqualDeep(a2, b2) {
   return b2;
 }
 function shallowEqualObjects(a2, b2) {
-  if (!b2 || Object.keys(a2).length !== Object.keys(b2).length) {
+  if (a2 && !b2 || b2 && !a2) {
     return false;
   }
   for (const key in a2) {
@@ -4415,7 +4409,7 @@ function isPlainObject$1(o2) {
     return false;
   }
   const ctor = o2.constructor;
-  if (ctor === void 0) {
+  if (typeof ctor === "undefined") {
     return true;
   }
   const prot = ctor.prototype;
@@ -4435,6 +4429,9 @@ function sleep(ms) {
     setTimeout(resolve, ms);
   });
 }
+function scheduleMicrotask(callback) {
+  sleep(0).then(callback);
+}
 function replaceData(prevData, data, options) {
   if (typeof options.structuralSharing === "function") {
     return options.structuralSharing(prevData, data);
@@ -4451,7 +4448,6 @@ function addToStart(items, item, max2 = 0) {
   const newItems = [item, ...items];
   return max2 && newItems.length > max2 ? newItems.slice(0, -1) : newItems;
 }
-var skipToken = Symbol();
 var FocusManager = (_a = class extends Subscribable {
   constructor() {
     super();
@@ -4501,9 +4497,8 @@ var FocusManager = (_a = class extends Subscribable {
     }
   }
   onFocus() {
-    const isFocused = this.isFocused();
     this.listeners.forEach((listener) => {
-      listener(isFocused);
+      listener();
     });
   }
   isFocused() {
@@ -4708,10 +4703,6 @@ function createNotifyManager() {
   let batchNotifyFn = (callback) => {
     callback();
   };
-  let scheduleFn = (cb2) => setTimeout(cb2, 0);
-  const setScheduler = (fn2) => {
-    scheduleFn = fn2;
-  };
   const batch = (callback) => {
     let result;
     transactions++;
@@ -4729,7 +4720,7 @@ function createNotifyManager() {
     if (transactions) {
       queue.push(callback);
     } else {
-      scheduleFn(() => {
+      scheduleMicrotask(() => {
         notifyFn(callback);
       });
     }
@@ -4745,7 +4736,7 @@ function createNotifyManager() {
     const originalQueue = queue;
     queue = [];
     if (originalQueue.length) {
-      scheduleFn(() => {
+      scheduleMicrotask(() => {
         batchNotifyFn(() => {
           originalQueue.forEach((callback) => {
             notifyFn(callback);
@@ -4765,8 +4756,7 @@ function createNotifyManager() {
     batchCalls,
     schedule: schedule2,
     setNotifyFunction,
-    setBatchNotifyFunction,
-    setScheduler
+    setBatchNotifyFunction
   };
 }
 var notifyManager = createNotifyManager();
@@ -4801,17 +4791,19 @@ var Removable = (_c = class {
 var Query = (_d = class extends Removable {
   constructor(config2) {
     super();
+    __privateAdd(this, _setOptions);
     __privateAdd(this, _dispatch);
     __privateAdd(this, _initialState, void 0);
     __privateAdd(this, _revertState, void 0);
     __privateAdd(this, _cache, void 0);
+    __privateAdd(this, _promise, void 0);
     __privateAdd(this, _retryer, void 0);
     __privateAdd(this, _observers, void 0);
     __privateAdd(this, _defaultOptions, void 0);
     __privateAdd(this, _abortSignalConsumed, void 0);
     __privateSet(this, _abortSignalConsumed, false);
     __privateSet(this, _defaultOptions, config2.defaultOptions);
-    this.setOptions(config2.options);
+    __privateMethod(this, _setOptions, setOptions_fn).call(this, config2.options);
     __privateSet(this, _observers, []);
     __privateSet(this, _cache, config2.cache);
     this.queryKey = config2.queryKey;
@@ -4823,10 +4815,6 @@ var Query = (_d = class extends Removable {
   get meta() {
     return this.options.meta;
   }
-  setOptions(options) {
-    this.options = { ...__privateGet(this, _defaultOptions), ...options };
-    this.updateGcTime(this.options.gcTime);
-  }
   optionalRemove() {
     if (!__privateGet(this, _observers).length && this.state.fetchStatus === "idle") {
       __privateGet(this, _cache).remove(this);
@@ -4846,9 +4834,9 @@ var Query = (_d = class extends Removable {
     __privateMethod(this, _dispatch, dispatch_fn).call(this, { type: "setState", state, setStateOptions });
   }
   cancel(options) {
-    var _a2, _b2;
-    const promise2 = (_a2 = __privateGet(this, _retryer)) == null ? void 0 : _a2.promise;
-    (_b2 = __privateGet(this, _retryer)) == null ? void 0 : _b2.cancel(options);
+    var _a2;
+    const promise2 = __privateGet(this, _promise);
+    (_a2 = __privateGet(this, _retryer)) == null ? void 0 : _a2.cancel(options);
     return promise2 ? promise2.then(noop$2).catch(noop$2) : Promise.resolve();
   }
   destroy() {
@@ -4868,18 +4856,10 @@ var Query = (_d = class extends Removable {
     return this.getObserversCount() > 0 && !this.isActive();
   }
   isStale() {
-    if (this.state.isInvalidated) {
-      return true;
-    }
-    if (this.getObserversCount() > 0) {
-      return __privateGet(this, _observers).some(
-        (observer) => observer.getCurrentResult().isStale
-      );
-    }
-    return this.state.data === void 0;
+    return this.state.isInvalidated || !this.state.dataUpdatedAt || __privateGet(this, _observers).some((observer) => observer.getCurrentResult().isStale);
   }
   isStaleByTime(staleTime = 0) {
-    return this.state.isInvalidated || this.state.data === void 0 || !timeUntilStale(this.state.dataUpdatedAt, staleTime);
+    return this.state.isInvalidated || !this.state.dataUpdatedAt || !timeUntilStale(this.state.dataUpdatedAt, staleTime);
   }
   onFocus() {
     var _a2;
@@ -4925,22 +4905,22 @@ var Query = (_d = class extends Removable {
     }
   }
   fetch(options, fetchOptions) {
-    var _a2, _b2, _c2;
+    var _a2, _b2, _c2, _d2;
     if (this.state.fetchStatus !== "idle") {
-      if (this.state.data !== void 0 && (fetchOptions == null ? void 0 : fetchOptions.cancelRefetch)) {
+      if (this.state.dataUpdatedAt && (fetchOptions == null ? void 0 : fetchOptions.cancelRefetch)) {
         this.cancel({ silent: true });
-      } else if (__privateGet(this, _retryer)) {
-        __privateGet(this, _retryer).continueRetry();
-        return __privateGet(this, _retryer).promise;
+      } else if (__privateGet(this, _promise)) {
+        (_a2 = __privateGet(this, _retryer)) == null ? void 0 : _a2.continueRetry();
+        return __privateGet(this, _promise);
       }
     }
     if (options) {
-      this.setOptions(options);
+      __privateMethod(this, _setOptions, setOptions_fn).call(this, options);
     }
     if (!this.options.queryFn) {
       const observer = __privateGet(this, _observers).find((x2) => x2.options.queryFn);
       if (observer) {
-        this.setOptions(observer.options);
+        __privateMethod(this, _setOptions, setOptions_fn).call(this, observer.options);
       }
     }
     const abortController = new AbortController();
@@ -4959,7 +4939,7 @@ var Query = (_d = class extends Removable {
     };
     addSignalProperty(queryFnContext);
     const fetchFn = () => {
-      if (!this.options.queryFn || this.options.queryFn === skipToken) {
+      if (!this.options.queryFn) {
         return Promise.reject(
           new Error(`Missing queryFn: '${this.options.queryHash}'`)
         );
@@ -4984,16 +4964,16 @@ var Query = (_d = class extends Removable {
       fetchFn
     };
     addSignalProperty(context2);
-    (_a2 = this.options.behavior) == null ? void 0 : _a2.onFetch(
+    (_b2 = this.options.behavior) == null ? void 0 : _b2.onFetch(
       context2,
       this
     );
     __privateSet(this, _revertState, this.state);
-    if (this.state.fetchStatus === "idle" || this.state.fetchMeta !== ((_b2 = context2.fetchOptions) == null ? void 0 : _b2.meta)) {
-      __privateMethod(this, _dispatch, dispatch_fn).call(this, { type: "fetch", meta: (_c2 = context2.fetchOptions) == null ? void 0 : _c2.meta });
+    if (this.state.fetchStatus === "idle" || this.state.fetchMeta !== ((_c2 = context2.fetchOptions) == null ? void 0 : _c2.meta)) {
+      __privateMethod(this, _dispatch, dispatch_fn).call(this, { type: "fetch", meta: (_d2 = context2.fetchOptions) == null ? void 0 : _d2.meta });
     }
     const onError = (error) => {
-      var _a3, _b3, _c3, _d2;
+      var _a3, _b3, _c3, _d3;
       if (!(isCancelledError(error) && error.silent)) {
         __privateMethod(this, _dispatch, dispatch_fn).call(this, {
           type: "error",
@@ -5006,7 +4986,7 @@ var Query = (_d = class extends Removable {
           error,
           this
         );
-        (_d2 = (_c3 = __privateGet(this, _cache).config).onSettled) == null ? void 0 : _d2.call(
+        (_d3 = (_c3 = __privateGet(this, _cache).config).onSettled) == null ? void 0 : _d3.call(
           _c3,
           this.state.data,
           error,
@@ -5022,14 +5002,14 @@ var Query = (_d = class extends Removable {
       fn: context2.fetchFn,
       abort: abortController.abort.bind(abortController),
       onSuccess: (data) => {
-        var _a3, _b3, _c3, _d2;
-        if (data === void 0) {
+        var _a3, _b3, _c3, _d3;
+        if (typeof data === "undefined") {
           onError(new Error(`${this.queryHash} data is undefined`));
           return;
         }
         this.setData(data);
         (_b3 = (_a3 = __privateGet(this, _cache).config).onSuccess) == null ? void 0 : _b3.call(_a3, data, this);
-        (_d2 = (_c3 = __privateGet(this, _cache).config).onSettled) == null ? void 0 : _d2.call(
+        (_d3 = (_c3 = __privateGet(this, _cache).config).onSettled) == null ? void 0 : _d3.call(
           _c3,
           data,
           this.state.error,
@@ -5054,9 +5034,13 @@ var Query = (_d = class extends Removable {
       retryDelay: context2.options.retryDelay,
       networkMode: context2.options.networkMode
     }));
-    return __privateGet(this, _retryer).promise;
+    __privateSet(this, _promise, __privateGet(this, _retryer).promise);
+    return __privateGet(this, _promise);
   }
-}, _initialState = new WeakMap(), _revertState = new WeakMap(), _cache = new WeakMap(), _retryer = new WeakMap(), _observers = new WeakMap(), _defaultOptions = new WeakMap(), _abortSignalConsumed = new WeakMap(), _dispatch = new WeakSet(), dispatch_fn = function(action) {
+}, _initialState = new WeakMap(), _revertState = new WeakMap(), _cache = new WeakMap(), _promise = new WeakMap(), _retryer = new WeakMap(), _observers = new WeakMap(), _defaultOptions = new WeakMap(), _abortSignalConsumed = new WeakMap(), _setOptions = new WeakSet(), setOptions_fn = function(options) {
+  this.options = { ...__privateGet(this, _defaultOptions), ...options };
+  this.updateGcTime(this.options.gcTime);
+}, _dispatch = new WeakSet(), dispatch_fn = function(action) {
   const reducer2 = (state) => {
     switch (action.type) {
       case "failed":
@@ -5078,8 +5062,14 @@ var Query = (_d = class extends Removable {
       case "fetch":
         return {
           ...state,
-          ...fetchState(state.data, this.options),
-          fetchMeta: action.meta ?? null
+          fetchFailureCount: 0,
+          fetchFailureReason: null,
+          fetchMeta: action.meta ?? null,
+          fetchStatus: canFetch(this.options.networkMode) ? "fetching" : "paused",
+          ...!state.dataUpdatedAt && {
+            error: null,
+            status: "pending"
+          }
         };
       case "success":
         return {
@@ -5131,20 +5121,9 @@ var Query = (_d = class extends Removable {
     __privateGet(this, _cache).notify({ query: this, type: "updated", action });
   });
 }, _d);
-function fetchState(data, options) {
-  return {
-    fetchFailureCount: 0,
-    fetchFailureReason: null,
-    fetchStatus: canFetch(options.networkMode) ? "fetching" : "paused",
-    ...data === void 0 && {
-      error: null,
-      status: "pending"
-    }
-  };
-}
 function getDefaultState$1(options) {
   const data = typeof options.initialData === "function" ? options.initialData() : options.initialData;
-  const hasData = data !== void 0;
+  const hasData = typeof data !== "undefined";
   const initialDataUpdatedAt = hasData ? typeof options.initialDataUpdatedAt === "function" ? options.initialDataUpdatedAt() : options.initialDataUpdatedAt : 0;
   return {
     data,
@@ -5581,11 +5560,9 @@ function infiniteQueryBehavior(pages) {
             }
           });
         };
-        const queryFn = context2.options.queryFn && context2.options.queryFn !== skipToken ? context2.options.queryFn : () => {
-          return Promise.reject(
-            new Error(`Missing queryFn: '${context2.options.queryHash}'`)
-          );
-        };
+        const queryFn = context2.options.queryFn || (() => Promise.reject(
+          new Error(`Missing queryFn: '${context2.options.queryHash}'`)
+        ));
         const fetchPage = async (data, param, previous) => {
           if (cancelled) {
             return Promise.reject();
@@ -5703,15 +5680,15 @@ var QueryClient = (_h = class {
     __privateWrapper(this, _mountCount)._++;
     if (__privateGet(this, _mountCount) !== 1)
       return;
-    __privateSet(this, _unsubscribeFocus, focusManager.subscribe(async (focused) => {
-      if (focused) {
-        await this.resumePausedMutations();
+    __privateSet(this, _unsubscribeFocus, focusManager.subscribe(() => {
+      if (focusManager.isFocused()) {
+        this.resumePausedMutations();
         __privateGet(this, _queryCache).onFocus();
       }
     }));
-    __privateSet(this, _unsubscribeOnline, onlineManager.subscribe(async (online) => {
-      if (online) {
-        await this.resumePausedMutations();
+    __privateSet(this, _unsubscribeOnline, onlineManager.subscribe(() => {
+      if (onlineManager.isOnline()) {
+        this.resumePausedMutations();
         __privateGet(this, _queryCache).onOnline();
       }
     }));
@@ -5734,21 +5711,11 @@ var QueryClient = (_h = class {
   }
   getQueryData(queryKey) {
     var _a2;
-    const options = this.defaultQueryOptions({ queryKey });
-    return (_a2 = __privateGet(this, _queryCache).get(options.queryHash)) == null ? void 0 : _a2.state.data;
+    return (_a2 = __privateGet(this, _queryCache).find({ queryKey })) == null ? void 0 : _a2.state.data;
   }
   ensureQueryData(options) {
     const cachedData = this.getQueryData(options.queryKey);
-    if (cachedData === void 0)
-      return this.fetchQuery(options);
-    else {
-      const defaultedOptions = this.defaultQueryOptions(options);
-      const query = __privateGet(this, _queryCache).build(this, defaultedOptions);
-      if (options.revalidateIfStale && query.isStaleByTime(defaultedOptions.staleTime)) {
-        void this.prefetchQuery(defaultedOptions);
-      }
-      return Promise.resolve(cachedData);
-    }
+    return cachedData !== void 0 ? Promise.resolve(cachedData) : this.fetchQuery(options);
   }
   getQueriesData(filters2) {
     return this.getQueryCache().findAll(filters2).map(({ queryKey, state }) => {
@@ -5757,15 +5724,13 @@ var QueryClient = (_h = class {
     });
   }
   setQueryData(queryKey, updater, options) {
-    const defaultedOptions = this.defaultQueryOptions({ queryKey });
-    const query = __privateGet(this, _queryCache).get(
-      defaultedOptions.queryHash
-    );
+    const query = __privateGet(this, _queryCache).find({ queryKey });
     const prevData = query == null ? void 0 : query.state.data;
     const data = functionalUpdate(updater, prevData);
-    if (data === void 0) {
+    if (typeof data === "undefined") {
       return void 0;
     }
+    const defaultedOptions = this.defaultQueryOptions({ queryKey });
     return __privateGet(this, _queryCache).build(this, defaultedOptions).setData(data, { ...options, manual: true });
   }
   setQueriesData(filters2, updater, options) {
@@ -5778,8 +5743,7 @@ var QueryClient = (_h = class {
   }
   getQueryState(queryKey) {
     var _a2;
-    const options = this.defaultQueryOptions({ queryKey });
-    return (_a2 = __privateGet(this, _queryCache).get(options.queryHash)) == null ? void 0 : _a2.state;
+    return (_a2 = __privateGet(this, _queryCache).find({ queryKey })) == null ? void 0 : _a2.state;
   }
   removeQueries(filters2) {
     const queryCache = __privateGet(this, _queryCache);
@@ -5842,7 +5806,7 @@ var QueryClient = (_h = class {
   }
   fetchQuery(options) {
     const defaultedOptions = this.defaultQueryOptions(options);
-    if (defaultedOptions.retry === void 0) {
+    if (typeof defaultedOptions.retry === "undefined") {
       defaultedOptions.retry = false;
     }
     const query = __privateGet(this, _queryCache).build(this, defaultedOptions);
@@ -5859,10 +5823,7 @@ var QueryClient = (_h = class {
     return this.fetchInfiniteQuery(options).then(noop$2).catch(noop$2);
   }
   resumePausedMutations() {
-    if (onlineManager.isOnline()) {
-      return __privateGet(this, _mutationCache2).resumePausedMutations();
-    }
-    return Promise.resolve();
+    return __privateGet(this, _mutationCache2).resumePausedMutations();
   }
   getQueryCache() {
     return __privateGet(this, _queryCache);
@@ -5909,12 +5870,12 @@ var QueryClient = (_h = class {
     return result;
   }
   defaultQueryOptions(options) {
-    if (options._defaulted) {
+    if (options == null ? void 0 : options._defaulted) {
       return options;
     }
     const defaultedOptions = {
       ...__privateGet(this, _defaultOptions3).queries,
-      ...this.getQueryDefaults(options.queryKey),
+      ...(options == null ? void 0 : options.queryKey) && this.getQueryDefaults(options.queryKey),
       ...options,
       _defaulted: true
     };
@@ -5924,18 +5885,15 @@ var QueryClient = (_h = class {
         defaultedOptions
       );
     }
-    if (defaultedOptions.refetchOnReconnect === void 0) {
+    if (typeof defaultedOptions.refetchOnReconnect === "undefined") {
       defaultedOptions.refetchOnReconnect = defaultedOptions.networkMode !== "always";
     }
-    if (defaultedOptions.throwOnError === void 0) {
+    if (typeof defaultedOptions.throwOnError === "undefined") {
       defaultedOptions.throwOnError = !!defaultedOptions.suspense;
     }
-    if (!defaultedOptions.networkMode && defaultedOptions.persister) {
+    if (typeof defaultedOptions.networkMode === "undefined" && defaultedOptions.persister) {
       defaultedOptions.networkMode = "offlineFirst";
     }
-    if (defaultedOptions.enabled !== true && defaultedOptions.queryFn === skipToken) {
-      defaultedOptions.enabled = false;
-    }
     return defaultedOptions;
   }
   defaultMutationOptions(options) {
@@ -5981,9 +5939,13 @@ var QueryObserver = (_i = class extends Subscribable {
     __privateAdd(this, _staleTimeoutId, void 0);
     __privateAdd(this, _refetchIntervalId, void 0);
     __privateAdd(this, _currentRefetchInterval, void 0);
-    __privateAdd(this, _trackedProps, /* @__PURE__ */ new Set());
-    this.options = options;
+    __privateAdd(this, _trackedProps, void 0);
+    __privateSet(this, _currentQuery, void 0);
+    __privateSet(this, _currentQueryInitialState, void 0);
+    __privateSet(this, _currentResult, void 0);
+    __privateSet(this, _trackedProps, /* @__PURE__ */ new Set());
     __privateSet(this, _client, client);
+    this.options = options;
     __privateSet(this, _selectError, null);
     this.bindMethods();
     this.setOptions(options);
@@ -6031,18 +5993,20 @@ var QueryObserver = (_i = class extends Subscribable {
     const prevOptions = this.options;
     const prevQuery = __privateGet(this, _currentQuery);
     this.options = __privateGet(this, _client).defaultQueryOptions(options);
-    if (this.options.enabled !== void 0 && typeof this.options.enabled !== "boolean") {
-      throw new Error("Expected enabled to be a boolean");
-    }
-    __privateMethod(this, _updateQuery, updateQuery_fn).call(this);
-    __privateGet(this, _currentQuery).setOptions(this.options);
-    if (prevOptions._defaulted && !shallowEqualObjects(this.options, prevOptions)) {
+    if (!shallowEqualObjects(prevOptions, this.options)) {
       __privateGet(this, _client).getQueryCache().notify({
         type: "observerOptionsUpdated",
         query: __privateGet(this, _currentQuery),
         observer: this
       });
     }
+    if (typeof this.options.enabled !== "undefined" && typeof this.options.enabled !== "boolean") {
+      throw new Error("Expected enabled to be a boolean");
+    }
+    if (!this.options.queryKey) {
+      this.options.queryKey = prevOptions.queryKey;
+    }
+    __privateMethod(this, _updateQuery, updateQuery_fn).call(this);
     const mounted = this.hasListeners();
     if (mounted && shouldFetchOptionally(
       __privateGet(this, _currentQuery),
@@ -6074,24 +6038,20 @@ var QueryObserver = (_i = class extends Subscribable {
   getCurrentResult() {
     return __privateGet(this, _currentResult);
   }
-  trackResult(result, onPropTracked) {
+  trackResult(result) {
     const trackedResult = {};
     Object.keys(result).forEach((key) => {
       Object.defineProperty(trackedResult, key, {
         configurable: false,
         enumerable: true,
         get: () => {
-          this.trackProp(key);
-          onPropTracked == null ? void 0 : onPropTracked(key);
+          __privateGet(this, _trackedProps).add(key);
           return result[key];
         }
       });
     });
     return trackedResult;
   }
-  trackProp(key) {
-    __privateGet(this, _trackedProps).add(key);
-  }
   getCurrentQuery() {
     return __privateGet(this, _currentQuery);
   }
@@ -6125,7 +6085,7 @@ var QueryObserver = (_i = class extends Subscribable {
     const queryChange = query !== prevQuery;
     const queryInitialState = queryChange ? query.state : __privateGet(this, _currentQueryInitialState);
     const { state } = query;
-    let newState = { ...state };
+    let { error, errorUpdatedAt, fetchStatus, status } = state;
     let isPlaceholderData = false;
     let data;
     if (options._optimisticResults) {
@@ -6133,23 +6093,22 @@ var QueryObserver = (_i = class extends Subscribable {
       const fetchOnMount = !mounted && shouldFetchOnMount(query, options);
       const fetchOptionally = mounted && shouldFetchOptionally(query, prevQuery, options, prevOptions);
       if (fetchOnMount || fetchOptionally) {
-        newState = {
-          ...newState,
-          ...fetchState(state.data, query.options)
-        };
+        fetchStatus = canFetch(query.options.networkMode) ? "fetching" : "paused";
+        if (!state.dataUpdatedAt) {
+          status = "pending";
+        }
       }
       if (options._optimisticResults === "isRestoring") {
-        newState.fetchStatus = "idle";
+        fetchStatus = "idle";
       }
     }
-    let { error, errorUpdatedAt, status } = newState;
-    if (options.select && newState.data !== void 0) {
-      if (prevResult && newState.data === (prevResultState == null ? void 0 : prevResultState.data) && options.select === __privateGet(this, _selectFn)) {
+    if (options.select && typeof state.data !== "undefined") {
+      if (prevResult && state.data === (prevResultState == null ? void 0 : prevResultState.data) && options.select === __privateGet(this, _selectFn)) {
         data = __privateGet(this, _selectResult);
       } else {
         try {
           __privateSet(this, _selectFn, options.select);
-          data = options.select(newState.data);
+          data = options.select(state.data);
           data = replaceData(prevResult == null ? void 0 : prevResult.data, data, options);
           __privateSet(this, _selectResult, data);
           __privateSet(this, _selectError, null);
@@ -6158,9 +6117,9 @@ var QueryObserver = (_i = class extends Subscribable {
         }
       }
     } else {
-      data = newState.data;
+      data = state.data;
     }
-    if (options.placeholderData !== void 0 && data === void 0 && status === "pending") {
+    if (typeof options.placeholderData !== "undefined" && typeof data === "undefined" && status === "pending") {
       let placeholderData;
       if ((prevResult == null ? void 0 : prevResult.isPlaceholderData) && options.placeholderData === (prevResultOptions == null ? void 0 : prevResultOptions.placeholderData)) {
         placeholderData = prevResult.data;
@@ -6169,7 +6128,7 @@ var QueryObserver = (_i = class extends Subscribable {
           (_a2 = __privateGet(this, _lastQueryWithDefinedData)) == null ? void 0 : _a2.state.data,
           __privateGet(this, _lastQueryWithDefinedData)
         ) : options.placeholderData;
-        if (options.select && placeholderData !== void 0) {
+        if (options.select && typeof placeholderData !== "undefined") {
           try {
             placeholderData = options.select(placeholderData);
             __privateSet(this, _selectError, null);
@@ -6178,7 +6137,7 @@ var QueryObserver = (_i = class extends Subscribable {
           }
         }
       }
-      if (placeholderData !== void 0) {
+      if (typeof placeholderData !== "undefined") {
         status = "success";
         data = replaceData(
           prevResult == null ? void 0 : prevResult.data,
@@ -6194,34 +6153,33 @@ var QueryObserver = (_i = class extends Subscribable {
       errorUpdatedAt = Date.now();
       status = "error";
     }
-    const isFetching = newState.fetchStatus === "fetching";
+    const isFetching = fetchStatus === "fetching";
     const isPending = status === "pending";
     const isError2 = status === "error";
     const isLoading = isPending && isFetching;
-    const hasData = data !== void 0;
     const result = {
       status,
-      fetchStatus: newState.fetchStatus,
+      fetchStatus,
       isPending,
       isSuccess: status === "success",
       isError: isError2,
       isInitialLoading: isLoading,
       isLoading,
       data,
-      dataUpdatedAt: newState.dataUpdatedAt,
+      dataUpdatedAt: state.dataUpdatedAt,
       error,
       errorUpdatedAt,
-      failureCount: newState.fetchFailureCount,
-      failureReason: newState.fetchFailureReason,
-      errorUpdateCount: newState.errorUpdateCount,
-      isFetched: newState.dataUpdateCount > 0 || newState.errorUpdateCount > 0,
-      isFetchedAfterMount: newState.dataUpdateCount > queryInitialState.dataUpdateCount || newState.errorUpdateCount > queryInitialState.errorUpdateCount,
+      failureCount: state.fetchFailureCount,
+      failureReason: state.fetchFailureReason,
+      errorUpdateCount: state.errorUpdateCount,
+      isFetched: state.dataUpdateCount > 0 || state.errorUpdateCount > 0,
+      isFetchedAfterMount: state.dataUpdateCount > queryInitialState.dataUpdateCount || state.errorUpdateCount > queryInitialState.errorUpdateCount,
       isFetching,
       isRefetching: isFetching && !isPending,
-      isLoadingError: isError2 && !hasData,
-      isPaused: newState.fetchStatus === "paused",
+      isLoadingError: isError2 && state.dataUpdatedAt === 0,
+      isPaused: fetchStatus === "paused",
       isPlaceholderData,
-      isRefetchError: isError2 && hasData,
+      isRefetchError: isError2 && state.dataUpdatedAt !== 0,
       isStale: isStale(query, options),
       refetch: this.refetch
     };
@@ -6349,10 +6307,10 @@ var QueryObserver = (_i = class extends Subscribable {
   });
 }, _i);
 function shouldLoadOnMount(query, options) {
-  return options.enabled !== false && query.state.data === void 0 && !(query.state.status === "error" && options.retryOnMount === false);
+  return options.enabled !== false && !query.state.dataUpdatedAt && !(query.state.status === "error" && options.retryOnMount === false);
 }
 function shouldFetchOnMount(query, options) {
-  return shouldLoadOnMount(query, options) || query.state.data !== void 0 && shouldFetchOn(query, options, options.refetchOnMount);
+  return shouldLoadOnMount(query, options) || query.state.dataUpdatedAt > 0 && shouldFetchOn(query, options, options.refetchOnMount);
 }
 function shouldFetchOn(query, options, field) {
   if (options.enabled !== false) {
@@ -6362,10 +6320,10 @@ function shouldFetchOn(query, options, field) {
   return false;
 }
 function shouldFetchOptionally(query, prevQuery, options, prevOptions) {
-  return (query !== prevQuery || prevOptions.enabled === false) && (!options.suspense || query.state.status !== "error") && isStale(query, options);
+  return options.enabled !== false && (query !== prevQuery || prevOptions.enabled === false) && (!options.suspense || query.state.status !== "error") && isStale(query, options);
 }
 function isStale(query, options) {
-  return options.enabled !== false && query.isStaleByTime(options.staleTime);
+  return query.isStaleByTime(options.staleTime);
 }
 function shouldAssignObserverCurrentProperties(observer, optimisticResult) {
   if (!shallowEqualObjects(observer.getCurrentResult(), optimisticResult)) {
@@ -6374,6 +6332,7 @@ function shouldAssignObserverCurrentProperties(observer, optimisticResult) {
   return false;
 }
 var InfiniteQueryObserver = class extends QueryObserver {
+  // eslint-disable-next-line @typescript-eslint/no-useless-constructor
   constructor(client, options) {
     super(client, options);
   }
@@ -6439,6 +6398,7 @@ var MutationObserver$1 = (_j = class extends Subscribable {
     __privateAdd(this, _currentResult2, void 0);
     __privateAdd(this, _currentMutation, void 0);
     __privateAdd(this, _mutateOptions, void 0);
+    __privateSet(this, _currentResult2, void 0);
     __privateSet(this, _client2, client);
     this.setOptions(options);
     this.bindMethods();
@@ -6452,18 +6412,14 @@ var MutationObserver$1 = (_j = class extends Subscribable {
     var _a2;
     const prevOptions = this.options;
     this.options = __privateGet(this, _client2).defaultMutationOptions(options);
-    if (!shallowEqualObjects(this.options, prevOptions)) {
+    if (!shallowEqualObjects(prevOptions, this.options)) {
       __privateGet(this, _client2).getMutationCache().notify({
         type: "observerOptionsUpdated",
         mutation: __privateGet(this, _currentMutation),
         observer: this
       });
     }
-    if ((prevOptions == null ? void 0 : prevOptions.mutationKey) && this.options.mutationKey && hashKey(prevOptions.mutationKey) !== hashKey(this.options.mutationKey)) {
-      this.reset();
-    } else if (((_a2 = __privateGet(this, _currentMutation)) == null ? void 0 : _a2.state.status) === "pending") {
-      __privateGet(this, _currentMutation).setOptions(this.options);
-    }
+    (_a2 = __privateGet(this, _currentMutation)) == null ? void 0 : _a2.setOptions(this.options);
   }
   onUnsubscribe() {
     var _a2;
@@ -6479,8 +6435,6 @@ var MutationObserver$1 = (_j = class extends Subscribable {
     return __privateGet(this, _currentResult2);
   }
   reset() {
-    var _a2;
-    (_a2 = __privateGet(this, _currentMutation)) == null ? void 0 : _a2.removeObserver(this);
     __privateSet(this, _currentMutation, void 0);
     __privateMethod(this, _updateResult, updateResult_fn).call(this);
     __privateMethod(this, _notify2, notify_fn2).call(this);
@@ -6509,19 +6463,33 @@ var MutationObserver$1 = (_j = class extends Subscribable {
   notifyManager.batch(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
     if (__privateGet(this, _mutateOptions) && this.hasListeners()) {
-      const variables = __privateGet(this, _currentResult2).variables;
-      const context2 = __privateGet(this, _currentResult2).context;
       if ((action == null ? void 0 : action.type) === "success") {
-        (_b2 = (_a2 = __privateGet(this, _mutateOptions)).onSuccess) == null ? void 0 : _b2.call(_a2, action.data, variables, context2);
-        (_d2 = (_c2 = __privateGet(this, _mutateOptions)).onSettled) == null ? void 0 : _d2.call(_c2, action.data, null, variables, context2);
+        (_b2 = (_a2 = __privateGet(this, _mutateOptions)).onSuccess) == null ? void 0 : _b2.call(
+          _a2,
+          action.data,
+          __privateGet(this, _currentResult2).variables,
+          __privateGet(this, _currentResult2).context
+        );
+        (_d2 = (_c2 = __privateGet(this, _mutateOptions)).onSettled) == null ? void 0 : _d2.call(
+          _c2,
+          action.data,
+          null,
+          __privateGet(this, _currentResult2).variables,
+          __privateGet(this, _currentResult2).context
+        );
       } else if ((action == null ? void 0 : action.type) === "error") {
-        (_f2 = (_e2 = __privateGet(this, _mutateOptions)).onError) == null ? void 0 : _f2.call(_e2, action.error, variables, context2);
+        (_f2 = (_e2 = __privateGet(this, _mutateOptions)).onError) == null ? void 0 : _f2.call(
+          _e2,
+          action.error,
+          __privateGet(this, _currentResult2).variables,
+          __privateGet(this, _currentResult2).context
+        );
         (_h2 = (_g2 = __privateGet(this, _mutateOptions)).onSettled) == null ? void 0 : _h2.call(
           _g2,
           void 0,
           action.error,
-          variables,
-          context2
+          __privateGet(this, _currentResult2).variables,
+          __privateGet(this, _currentResult2).context
         );
       }
     }
@@ -6553,7 +6521,7 @@ var QueryClientProvider = ({
       client.unmount();
     };
   }, [client]);
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(QueryClientContext.Provider, { value: client, children });
+  return /* @__PURE__ */ reactExports.createElement(QueryClientContext.Provider, { value: client }, children);
 };
 var IsRestoringContext = reactExports.createContext(false);
 var useIsRestoring = () => reactExports.useContext(IsRestoringContext);
@@ -6580,8 +6548,6 @@ function shouldThrowError(throwError, params) {
   }
   return !!throwError;
 }
-function noop$1() {
-}
 var ensurePreventErrorBoundaryRetry = (options, errorResetBoundary) => {
   if (options.suspense || options.throwOnError) {
     if (!errorResetBoundary.isReset()) {
@@ -6600,7 +6566,7 @@ var getHasError = ({
   throwOnError,
   query
 }) => {
-  return result.isError && !errorResetBoundary.isReset() && !result.isFetching && query && shouldThrowError(throwOnError, [result.error, query]);
+  return result.isError && !errorResetBoundary.isReset() && !result.isFetching && shouldThrowError(throwOnError, [result.error, query]);
 };
 var ensureStaleTime = (defaultedOptions) => {
   if (defaultedOptions.suspense) {
@@ -6651,7 +6617,7 @@ function useBaseQuery(options, Observer2, queryClient2) {
     result,
     errorResetBoundary,
     throwOnError: defaultedOptions.throwOnError,
-    query: client.getQueryCache().get(defaultedOptions.queryHash)
+    query: observer.getCurrentQuery()
   })) {
     throw result.error;
   }
@@ -6690,9 +6656,12 @@ function useMutation(options, queryClient2) {
   }
   return { ...result, mutate, mutateAsync: result.mutate };
 }
+function noop$1() {
+}
 function useInfiniteQuery(options, queryClient2) {
   return useBaseQuery(
     options,
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
     InfiniteQueryObserver,
     queryClient2
   );

package/dist/version.txt

@@ -1 +1 @@
-ode-explorer=1.0-b2school-SNAPSHOT 18/04/2024 15:00:53
+ode-explorer=1.0-b2school-SNAPSHOT 18/04/2024 15:32:42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ode-explorer",
-  "version": "1.4.2-develop-pedago.202404181500",
+  "version": "1.4.2-develop-pedago.202404181532",
   "description": "Edifice Explorer",
   "homepage": "https://github.com/edificeio/explorer#readme",
   "bugs": {
@@ -39,7 +39,7 @@
     "@edifice-ui/icons": "develop-pedago",
     "@edifice-ui/react": "develop-pedago",
     "@react-spring/web": "9.7.3",
-    "@tanstack/react-query": "5.28.8",
+    "@tanstack/react-query": "5.8.4",
     "clsx": "2.1.0",
     "dayjs": "1.11.10",
     "i18next": "23.8.1",