@redneckz/wildless-cms-uni-blocks 0.14.102 → 0.14.103

package/bundle/bundle.umd.js

@@ -762,25 +762,24 @@
     const isFilled = (_) => _ !== null && _ !== undefined;
 
     const defaultCache = new Map();
-    const applyCache = (fetcher, cache = defaultCache) => (key) => {
+    const applyCache = (fetcher, cache = defaultCache) => (args) => {
+        const key = computeKey(args);
         const cachedData = cache.get(key);
-        if (isFilled(cachedData)) {
+        if (key && isFilled(cachedData)) {
             return cachedData;
         }
-        const data = fetcher(key);
-        if (isFilled(data)) {
+        const data = fetcher(...args);
+        if (key && isFilled(data)) {
             cache.set(key, Promise.resolve(data));
         }
-        else {
-            cache.delete(key);
-        }
         return data;
-    };
+    };
+    const isKey = (args) => Boolean(args?.every(_ => (Array.isArray(_) ? isKey(_) : !_ || typeof _ === 'string')));
+    const computeKey = (args) => (isKey(args) ? args.toString() : '');
 
-    const isSimpleKey = (args) => Boolean(args && Array.isArray(args) && args.length === 1 && typeof args[0] === 'string');
+    const isFallbackKey = (args) => Boolean(args && Array.isArray(args) && args.length === 1 && typeof args[0] === 'string');
     function useAsyncData(key, fetcher, { fallback, cache } = {}) {
         const args = useMemo(() => keyToArgs(key), [key]);
-        const [simpleKey] = isSimpleKey(args) ? args : [];
         const [data, setData] = useState(undefined);
         const [error, setError] = useState(undefined);
         useEffect(() => {
@@ -797,7 +796,7 @@
             };
             (async () => {
                 try {
-                    setResult(await (simpleKey ? applyCache(fetcher, cache)(simpleKey) : fetcher(...args)));
+                    setResult(await applyCache(fetcher, cache)(args));
                 }
                 catch (err) {
                     setResult(undefined, err);
@@ -807,7 +806,7 @@
                 canceled = true;
             };
         }, [fetcher, cache, args]);
-        const fallbackData = fallback && simpleKey && fallback[simpleKey];
+        const fallbackData = fallback && isFallbackKey(args) && fallback[args[0]];
         return {
             data: !data && fallbackData ? fallbackData : data,
             error,
@@ -835,7 +834,7 @@
         }
         return null;
     }
-    async function fetchJSONUnsafe(url, options) {
+    const fetchJSONUnsafe = async (url, options) => {
         const response = await fetch(url, {
             ...options,
             headers: {
@@ -844,7 +843,7 @@
             },
         });
         return response.json();
-    }
+    };
 
     const EMPTY_VALUE$5 = {};
     const DEFAULT_FOLDER_NAME = 'wcms-resources';
@@ -3334,14 +3333,19 @@
         return (jsxs("div", { children: [item?.title ? (jsx("div", { className: "mb-m", children: jsx(Text, { size: "text-m", font: "font-light", color: "text-secondary-text", children: item.title }) })) : null, jsx(SlideCheckboxGroup, { items: options, multiple: true, ...field(key) })] }, key));
     };
 
-    const getPeriod = (source, content) => source[content?.sourceBook]?.rateRows
-        .map((el) => el.minMonths)
-        .filter((minMonths) => minMonths !== undefined);
+    const getPeriod = (source, content) => {
+        const sourceItem = source[content?.sourceBook];
+        return sourceItem
+            ? sourceItem?.rateRows
+                .map((el) => el.minMonths)
+                .filter((minMonths) => minMonths !== undefined)
+            : [];
+    };
 
-    async function fetchMultitudeJSON(...urls) {
+    const fetchMultitudeJSON = (...urls) => {
         const fetchPromises = urls.map((url) => fetchJSON(url));
         return Promise.all(fetchPromises);
-    }
+    };
 
     const unique = (list) => [...new Set(list)];
 
@@ -3531,7 +3535,7 @@
             storeLocation(_);
             fireCurrentLocation(_);
         }, []);
-        const { data } = useAsyncData(REGION_URL, fetchJSONUnsafe);
+        const { data } = useAsyncData(hasStoredLocation() ? null : REGION_URL, fetchJSONUnsafe);
         useEffect(() => {
             if (data && !hasStoredLocation()) {
                 fireCurrentLocation(data);
@@ -5790,7 +5794,7 @@
         return (jsx("div", { className: "flex items-end absolute bottom-0 right-0 h-full pointer-events-none", children: jsx(LikeControl, { className: "rounded-tl-3xl sticky bottom-0 pointer-events-auto" }) }));
     }
 
-    const packageVersion = "0.14.101";
+    const packageVersion = "0.14.102";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;