@gaddario98/react-core 2.1.7 → 2.1.9

package/dist/pages/index.mjs

@@ -1,4 +1,4 @@
-import {jsx,jsxs}from'react/jsx-runtime';import {useRef,useState,useEffect,useCallback,memo,useMemo,createContext,useContext}from'react';import {useApiValues,useApiConfigValue,useApi,queriesAtom}from'../queries/index.mjs';import {atom,useAtom,useStore}from'jotai';import {c}from'react/compiler-runtime';import {atomStateGenerator}from'../state/index.mjs';import equal from'fast-deep-equal';import {useFormValues,useFormManager}from'../form/index.mjs';import {atomFamily}from'jotai-family';import {QueryObserver}from'@tanstack/react-query';/******************************************************************************
+import {jsx,jsxs}from'react/jsx-runtime';import {useRef,useState,useEffect,useCallback,memo,useMemo,createContext,useContext}from'react';import {c}from'react/compiler-runtime';import {atomStateGenerator}from'../state/index.mjs';import equal from'fast-deep-equal';import {useFormValues,useFormManager}from'../form/index.mjs';import {atom,useAtom}from'jotai';import {useApiValues,useApiConfigValue,useApi,useInvalidateQueries}from'../queries/index.mjs';import {atomFamily}from'jotai-family';import {QueryObserver}from'@tanstack/react-query';/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -1534,147 +1534,88 @@ function useFormData({
     formData
   };
 };const EMPTY_ARRAY = [];
-const usePageConfig = t0 => {
-  const $ = c(27);
-  const {
-    queries: t1,
-    form,
-    ns,
-    viewSettings: t2,
-    meta,
-    variables,
-    pageId
-  } = t0;
-  const queries = t1 === undefined ? EMPTY_ARRAY : t1;
-  let t3;
-  if ($[0] !== t2) {
-    t3 = t2 === undefined ? {} : t2;
-    $[0] = t2;
-    $[1] = t3;
-  } else {
-    t3 = $[1];
-  }
-  const viewSettings = t3;
+const usePageConfig = ({
+  queries = EMPTY_ARRAY,
+  form,
+  ns,
+  viewSettings = {},
+  meta,
+  variables,
+  pageId
+}) => {
+  // Use global config usage if needed, but per-page config is primary
   const globalConfig = usePageConfigValue();
-  let t4;
-  if ($[2] !== form || $[3] !== ns || $[4] !== pageId) {
-    t4 = {
-      form,
-      pageId,
-      ns
-    };
-    $[2] = form;
-    $[3] = ns;
-    $[4] = pageId;
-    $[5] = t4;
-  } else {
-    t4 = $[5];
-  }
+  // 1. Form Management
   const {
     formData
-  } = usePageFormManager(t4);
-  let t5;
-  if ($[6] !== pageId || $[7] !== variables) {
-    t5 = {
-      pageId,
-      initialValues: variables
-    };
-    $[6] = pageId;
-    $[7] = variables;
-    $[8] = t5;
-  } else {
-    t5 = $[8];
-  }
+  } = usePageFormManager({
+    form,
+    pageId,
+    ns
+  });
   const {
     get,
     set
-  } = usePageValues(t5);
-  let t6;
-  if ($[9] !== get || $[10] !== queries || $[11] !== set) {
-    let t7;
-    if ($[13] !== get || $[14] !== set) {
-      t7 = q => {
-        if (q.type === "mutation") {
-          const mutationConfig = typeof q.mutationConfig === "function" ? q.mutationConfig({
-            get,
-            set
-          }) : q.mutationConfig;
-          return Object.assign(Object.assign({}, q), {
-            mutationConfig
-          });
-        } else {
-          if (q.type === "query") {
-            const queryConfig = typeof q.queryConfig === "function" ? q.queryConfig({
-              get,
-              set
-            }) : q.queryConfig;
-            return Object.assign(Object.assign({}, q), {
-              queryConfig
-            });
-          }
-        }
-        return q;
-      };
-      $[13] = get;
-      $[14] = set;
-      $[15] = t7;
-    } else {
-      t7 = $[15];
-    }
-    t6 = queries.map(t7);
-    $[9] = get;
-    $[10] = queries;
-    $[11] = set;
-    $[12] = t6;
-  } else {
-    t6 = $[12];
-  }
-  const processedQueries = t6;
-  let t7;
-  if ($[16] !== pageId) {
-    t7 = {
-      persistToAtoms: true,
-      scopeId: pageId
-    };
-    $[16] = pageId;
-    $[17] = t7;
-  } else {
-    t7 = $[17];
-  }
-  useApi(processedQueries, t7);
-  let t8;
-  if ($[18] !== pageId || $[19] !== viewSettings) {
-    t8 = {
-      viewSettings,
-      pageId
-    };
-    $[18] = pageId;
-    $[19] = viewSettings;
-    $[20] = t8;
-  } else {
-    t8 = $[20];
-  }
-  const mappedViewSettings = useViewSettings(t8);
-  let t9;
-  if ($[21] !== form || $[22] !== formData || $[23] !== globalConfig || $[24] !== mappedViewSettings || $[25] !== meta) {
-    t9 = {
+  } = usePageValues({
+    pageId,
+    initialValues: variables
+  });
+  // 2. Query Generation
+  const processedQueries = useMemo(() => {
+    return queries.map(q => {
+      if (q.type === "mutation") {
+        const mutationConfig = typeof q.mutationConfig === "function" ? q.mutationConfig({
+          get,
+          set
+        }) : q.mutationConfig;
+        return Object.assign(Object.assign({}, q), {
+          mutationConfig
+        });
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+      } else if (q.type === "query") {
+        const queryConfig = typeof q.queryConfig === "function" ? q.queryConfig({
+          get,
+          set
+        }) : q.queryConfig;
+        return Object.assign(Object.assign({}, q), {
+          queryConfig
+        });
+      }
+      return q;
+    });
+  }, [queries, get, set]);
+  useApi(processedQueries, {
+    persistToAtoms: true,
+    scopeId: pageId
+  });
+  const {
+    invalidateQueries
+  } = useInvalidateQueries();
+  const refreshQueries = useCallback(() => {
+    processedQueries.filter(el => el.type === "query").forEach(({
+      queryConfig: queryConfig_0
+    }) => {
+      if (queryConfig_0 === null || queryConfig_0 === void 0 ? void 0 : queryConfig_0.queryKey) invalidateQueries([queryConfig_0 === null || queryConfig_0 === void 0 ? void 0 : queryConfig_0.queryKey]);
+    });
+  }, [processedQueries]);
+  const mappedViewSettings = useViewSettings({
+    viewSettings,
+    pageId
+  });
+  // Merge custom configuration with defaults
+  const mergedConfig = useMemo(() => {
+    return {
       formData,
       form,
       mappedViewSettings,
       meta,
-      globalConfig
+      globalConfig // Expose global config if needed
     };
-    $[21] = form;
-    $[22] = formData;
-    $[23] = globalConfig;
-    $[24] = mappedViewSettings;
-    $[25] = meta;
-    $[26] = t9;
-  } else {
-    t9 = $[26];
-  }
-  const mergedConfig = t9;
-  return mergedConfig;
+  }, [formData, form, mappedViewSettings, meta, globalConfig]);
+  return {
+    mergedConfig,
+    refreshQueries
+  };
 };/**
  * Hook for evaluating and managing dynamic metadata.
  *
@@ -1921,7 +1862,10 @@ const MetadataManager = MetadataManagerImpl;const PageGenerator = _a => {
     viewSettings,
     ns
   } = useMemo(() => selectedProps, [selectedProps]);
-  const config = usePageConfig({
+  const {
+    mergedConfig,
+    refreshQueries
+  } = usePageConfig({
     queries,
     form,
     ns: ns !== null && ns !== void 0 ? ns : "",
@@ -1929,9 +1873,6 @@ const MetadataManager = MetadataManagerImpl;const PageGenerator = _a => {
     pageId: id,
     variables
   });
-  const {
-    mappedViewSettings
-  } = config;
   const {
     allContents,
     body,
@@ -1941,8 +1882,11 @@ const MetadataManager = MetadataManagerImpl;const PageGenerator = _a => {
     contents,
     pageId: id,
     ns,
-    pageConfig: config
+    pageConfig: mergedConfig
   });
+  const {
+    mappedViewSettings
+  } = mergedConfig;
   const LayoutComponent = useMemo(() => {
     var _a_0;
     return (_a_0 = mappedViewSettings.layoutComponent) !== null && _a_0 !== void 0 ? _a_0 : BodyContainer;
@@ -1960,13 +1904,6 @@ const MetadataManager = MetadataManagerImpl;const PageGenerator = _a => {
     return (_a_3 = mappedViewSettings.pageContainerProps) !== null && _a_3 !== void 0 ? _a_3 : {};
   }, [mappedViewSettings.pageContainerProps]);
   const layoutBody = useMemo(() => body, [body]);
-  const store = useStore();
-  const refreshQueries = useCallback(() => {
-    const val = store.get(queriesAtom);
-    Object.values(val).forEach(query => {
-      query.refetch();
-    });
-  }, [store]);
   return jsxs(PageContainerComponent, Object.assign({
     id: id
   }, pageContainerProps, {