@panneau/data 4.0.60 → 4.0.63

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _tanstack_react_query from '@tanstack/react-query';
-import { UseQueryOptions, UseQueryResult, UseMutationResult, UseMutationOptions, QueryClient } from '@tanstack/react-query';
+import { UseQueryOptions, UseQueryResult, UseMutationResult, UseMutationOptions, QueryClientConfig, QueryClient } from '@tanstack/react-query';
 import { Item, Pagination, Resource, ResourceItem } from '@panneau/core';
 import * as react from 'react';
 import { ReactNode } from 'react';
@@ -231,7 +231,7 @@ declare function ApiProvider({ api: initialApi, baseUrl, onUnauthorized, childre
 
 type QueryInitialData = Record<string, unknown> | Array<Record<string, unknown>>;
 interface QueryProviderProps {
-    config?: Record<string, unknown> | null;
+    config?: QueryClientConfig | null;
     initialKey?: string[] | null;
     initialData?: QueryInitialData | null;
     children: ReactNode;
@@ -242,9 +242,14 @@ declare function QueryProvider({ config: initialConfig, initialKey, initialData,
 interface DataProviderProps {
     api?: Api | null;
     apiBaseUrl?: string;
+    baseUrl?: string;
+    queryConfig?: QueryClientConfig | null;
+    initialQueryKey?: string[] | null;
+    initialQueryData?: Record<string, unknown> | Array<Record<string, unknown>> | null;
+    onUnauthorized?: (() => void) | null;
     children?: ReactNode;
 }
-declare function DataProvider({ api, apiBaseUrl, children }: DataProviderProps): react.JSX.Element;
+declare function DataProvider({ api, apiBaseUrl, baseUrl, children, queryConfig, initialQueryKey, initialQueryData, onUnauthorized, }: DataProviderProps): react.JSX.Element;
 
 export { Api, ApiProvider, Base as BaseApi, DataProvider, QueryProvider, useApi, useItem, useItems, useQueryContext, useResourceClone, useResourceDestroy, useResourceItem, useResourceItems, useResourceRestore, useResourceCreate as useResourceStore, useResourceUpdate };
 export type { UseItemsResponse };

package/dist/index.js

@@ -1,11 +1,11 @@
-import { useState, useMemo, use, createContext } from 'react';
+import { c } from 'react/compiler-runtime';
+import { useState, use, createContext } from 'react';
 import { useUrlGenerator, usePanneauResource, useResource } from '@panneau/core/contexts';
 import { getJSON, getCSRFHeaders, postJSON } from '@folklore/fetch';
 import { generatePath } from '@folklore/routes';
 import queryString from 'query-string';
 import { jsx } from 'react/jsx-runtime';
 import { useQuery, keepPreviousData, useMutation, QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { c } from 'react/compiler-runtime';
 import isArray from 'lodash-es/isArray';
 import isObject from 'lodash-es/isObject';
 import isString from 'lodash-es/isString';
@@ -820,23 +820,49 @@ const ApiContext = /*#__PURE__*/createContext(null);
 function useApi() {
   return use(ApiContext);
 }
-function ApiProvider({
-  api: initialApi = null,
-  baseUrl = undefined,
-  onUnauthorized = null,
-  children
-}) {
+function ApiProvider(t0) {
+  const $ = c(9);
+  const {
+    api: t1,
+    baseUrl: t2,
+    onUnauthorized: t3,
+    children
+  } = t0;
+  const initialApi = t1 === undefined ? null : t1;
+  const baseUrl = t2 === undefined ? undefined : t2;
+  const onUnauthorized = t3 === undefined ? null : t3;
   const generateUrl = useUrlGenerator();
   const previousApi = useApi();
-  const api = useMemo(() => initialApi || previousApi || new Api({
-    baseUrl,
-    generateUrl,
-    onUnauthorized
-  }), [previousApi, initialApi, baseUrl]);
-  return /*#__PURE__*/jsx(ApiContext, {
-    value: api,
-    children: children
-  });
+  let t4;
+  if ($[0] !== baseUrl || $[1] !== generateUrl || $[2] !== initialApi || $[3] !== onUnauthorized || $[4] !== previousApi) {
+    t4 = initialApi || previousApi || new Api({
+      baseUrl,
+      generateUrl,
+      onUnauthorized
+    });
+    $[0] = baseUrl;
+    $[1] = generateUrl;
+    $[2] = initialApi;
+    $[3] = onUnauthorized;
+    $[4] = previousApi;
+    $[5] = t4;
+  } else {
+    t4 = $[5];
+  }
+  const api = t4;
+  let t5;
+  if ($[6] !== api || $[7] !== children) {
+    t5 = /*#__PURE__*/jsx(ApiContext, {
+      value: api,
+      children: children
+    });
+    $[6] = api;
+    $[7] = children;
+    $[8] = t5;
+  } else {
+    t5 = $[8];
+  }
+  return t5;
 }
 
 function useResourceDestroy(t0, t1, t2) {
@@ -1220,19 +1246,24 @@ function useResourceRestore(resource, t0) {
   return t2;
 }
 
-/* eslint-disable react/jsx-props-no-spreading */
 const QueryContext = /*#__PURE__*/createContext(null);
 function useQueryContext() {
   return use(QueryContext);
 }
-function QueryProvider({
-  config: initialConfig = null,
-  initialKey = null,
-  initialData = null,
-  children
-}) {
-  const queryClient = useMemo(() => {
-    const client = new QueryClient({
+function QueryProvider(t0) {
+  const $ = c(7);
+  const {
+    config: t1,
+    initialKey: t2,
+    initialData: t3,
+    children
+  } = t0;
+  const initialConfig = t1 === undefined ? null : t1;
+  const initialKey = t2 === undefined ? null : t2;
+  const initialData = t3 === undefined ? null : t3;
+  let client;
+  if ($[0] !== initialConfig || $[1] !== initialData || $[2] !== initialKey) {
+    client = new QueryClient({
       defaultOptions: {
         queries: {
           staleTime: Infinity
@@ -1243,55 +1274,82 @@ function QueryProvider({
     if (initialKey !== null && initialData !== null) {
       client.setQueryData(initialKey, initialData);
     }
-    return client;
-  }, [initialConfig]);
-  return /*#__PURE__*/jsx(QueryClientProvider, {
-    client: queryClient,
-    children: children
-  });
+    $[0] = initialConfig;
+    $[1] = initialData;
+    $[2] = initialKey;
+    $[3] = client;
+  } else {
+    client = $[3];
+  }
+  let t4;
+  if ($[4] !== children || $[5] !== client) {
+    t4 = /*#__PURE__*/jsx(QueryClientProvider, {
+      client: client,
+      children: children
+    });
+    $[4] = children;
+    $[5] = client;
+    $[6] = t4;
+  } else {
+    t4 = $[6];
+  }
+  return t4;
 }
 
 function DataProvider(t0) {
-  const $ = c(7);
+  const $ = c(10);
   const {
     api: t1,
     apiBaseUrl: t2,
-    children: t3
+    baseUrl: t3,
+    children: t4,
+    queryConfig: t5,
+    initialQueryKey: t6,
+    initialQueryData: t7,
+    onUnauthorized: t8
   } = t0;
   const api = t1 === undefined ? null : t1;
   const apiBaseUrl = t2 === undefined ? undefined : t2;
-  const children = t3 === undefined ? null : t3;
-  const [client] = useState(_temp);
-  let t4;
-  if ($[0] !== api || $[1] !== apiBaseUrl || $[2] !== children) {
-    t4 = /*#__PURE__*/jsx(ApiProvider, {
+  const baseUrl = t3 === undefined ? undefined : t3;
+  const children = t4 === undefined ? null : t4;
+  const queryConfig = t5 === undefined ? null : t5;
+  const initialQueryKey = t6 === undefined ? null : t6;
+  const initialQueryData = t7 === undefined ? null : t7;
+  const onUnauthorized = t8 === undefined ? null : t8;
+  const t9 = baseUrl ?? apiBaseUrl;
+  let t10;
+  if ($[0] !== api || $[1] !== children || $[2] !== onUnauthorized || $[3] !== t9) {
+    t10 = /*#__PURE__*/jsx(ApiProvider, {
       api: api,
-      baseUrl: apiBaseUrl,
+      baseUrl: t9,
+      onUnauthorized: onUnauthorized,
       children: children
     });
     $[0] = api;
-    $[1] = apiBaseUrl;
-    $[2] = children;
-    $[3] = t4;
+    $[1] = children;
+    $[2] = onUnauthorized;
+    $[3] = t9;
+    $[4] = t10;
   } else {
-    t4 = $[3];
+    t10 = $[4];
   }
-  let t5;
-  if ($[4] !== client || $[5] !== t4) {
-    t5 = /*#__PURE__*/jsx(QueryClientProvider, {
-      client: client,
-      children: t4
+  let t11;
+  if ($[5] !== initialQueryData || $[6] !== initialQueryKey || $[7] !== queryConfig || $[8] !== t10) {
+    t11 = /*#__PURE__*/jsx(QueryProvider, {
+      config: queryConfig,
+      initialKey: initialQueryKey,
+      initialData: initialQueryData,
+      children: t10
     });
-    $[4] = client;
-    $[5] = t4;
-    $[6] = t5;
+    $[5] = initialQueryData;
+    $[6] = initialQueryKey;
+    $[7] = queryConfig;
+    $[8] = t10;
+    $[9] = t11;
   } else {
-    t5 = $[6];
+    t11 = $[9];
   }
-  return t5;
-}
-function _temp() {
-  return new QueryClient();
+  return t11;
 }
 
 export { Api, ApiProvider, Base as BaseApi, DataProvider, QueryProvider, useApi, useItem, useItems, useQueryContext, useResourceClone, useResourceDestroy, useResourceItem, useResourceItems, useResourceRestore, useResourceCreate as useResourceStore, useResourceUpdate };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/data",
-    "version": "4.0.60",
+    "version": "4.0.63",
     "description": "",
     "keywords": [
         "javascript"
@@ -71,5 +71,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "ec24c7cd579c8ff772ae0e751d67091f3bbb5b55"
+    "gitHead": "5b20f29e0c3cf377ae50b946ac93e037936f961a"
 }