@contentful/field-editor-shared 2.17.1-canary.59 → 2.17.2-canary.1

package/dist/cjs/hooks/useContentTypes.js

@@ -43,10 +43,13 @@ function useContentTypes(source) {
     const queryClient = (0, _queryClient.useQueryClient)();
     const spaceId = 'ids' in source ? source.ids.space : '';
     const environmentId = 'ids' in source ? source.ids.environmentAlias ?? source.ids.environment : '';
-    const queryParams = (0, _react.useMemo)(()=>({
+    const queryKey = (0, _react.useMemo)(()=>(0, _queryKeys.createGetManyContentTypesKey)(spaceId, environmentId, {
             limit: 1000
-        }), []);
-    const { data: contentTypes = [] } = (0, _queryClient.useQuery)((0, _queryKeys.createGetManyContentTypesKey)(spaceId, environmentId, queryParams), async ()=>{
+        }), [
+        spaceId,
+        environmentId
+    ]);
+    const { data: contentTypes = [] } = (0, _queryClient.useQuery)(queryKey, async ()=>{
         const allContentTypes = [];
         const limit = 1000;
         let skip = 0;
@@ -73,19 +76,17 @@ function useContentTypes(source) {
         }
         const unsubscribe = navigator.onSlideInNavigation(({ oldSlideLevel, newSlideLevel })=>{
             if (oldSlideLevel > newSlideLevel) {
-                void queryClient.invalidateQueries((0, _queryKeys.createGetManyContentTypesKey)(spaceId, environmentId, queryParams));
+                void queryClient.invalidateQueries(queryKey);
             }
         });
         return unsubscribe;
     }, [
         navigator,
         queryClient,
-        spaceId,
-        environmentId,
-        queryParams
+        queryKey
     ]);
     const invalidate = ()=>{
-        return queryClient.invalidateQueries((0, _queryKeys.createGetManyContentTypesKey)(spaceId, environmentId, queryParams));
+        return queryClient.invalidateQueries(queryKey);
     };
     return {
         contentTypes,

package/dist/cjs/index.js

@@ -75,9 +75,6 @@ _export(exports, {
     PredefinedValuesError: function() {
         return _PredefinedValuesError.PredefinedValuesError;
     },
-    SharedQueryClientProvider: function() {
-        return _queryClient.SharedQueryClientProvider;
-    },
     SpaceAPI: function() {
         return _appsdk.SpaceAPI;
     },
@@ -95,12 +92,6 @@ _export(exports, {
     },
     toLocaleString: function() {
         return _shortenStorageUnit.toLocaleString;
-    },
-    useQuery: function() {
-        return _queryClient.useQuery;
-    },
-    useQueryClient: function() {
-        return _queryClient.useQueryClient;
     }
 });
 const _ModalDialogLauncher = /*#__PURE__*/ _interop_require_wildcard(require("./ModalDialogLauncher"));
@@ -117,13 +108,11 @@ _export_star(require("./types"), exports);
 _export_star(require("./hooks/useActiveLocales"), exports);
 _export_star(require("./hooks/useReleaseStatus"), exports);
 _export_star(require("./hooks/useLocalePublishStatus"), exports);
-_export_star(require("./hooks/useContentTypes"), exports);
 _export_star(require("./LocalePublishingEntityStatusBadge"), exports);
 _export_star(require("./ReleaseEntityStatusBadge"), exports);
 _export_star(require("./utils/determineReleaseAction"), exports);
 _export_star(require("./utils/getEntityReleaseStatus"), exports);
 _export_star(require("./utils/getReleaseStatusBadgeConfig"), exports);
-const _queryClient = require("./queryClient");
 _export_star(require("./queryKeys"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {

package/dist/cjs/queryClient.js

@@ -20,6 +20,7 @@ _export(exports, {
     }
 });
 const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
+const _reactquery = require("@tanstack/react-query");
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -61,19 +62,11 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
-let RQQueryClient;
-let useRQ;
-let useHostQueryClient = ()=>undefined;
-try {
-    const rq = require('@tanstack/react-query');
-    RQQueryClient = rq.QueryClient;
-    useRQ = rq.useQuery;
-    useHostQueryClient = rq.useQueryClient;
-} catch  {}
 const clientContext = /*#__PURE__*/ _react.createContext(undefined);
+let sharedQueryClientInstance;
 function useMaybeHostQueryClient() {
     try {
-        return useHostQueryClient();
+        return (0, _reactquery.useQueryClient)();
     } catch  {
         return undefined;
     }
@@ -86,31 +79,28 @@ function useQueryClient() {
             return client;
         }
         if (hostClient) return hostClient;
-        if (!RQQueryClient) {
-            throw new Error('@tanstack/react-query is required to use QueryClient. Please install it as a dependency: npm install @tanstack/react-query');
-        }
-        return new RQQueryClient({
-            defaultOptions: {
-                queries: {
-                    useErrorBoundary: false,
-                    refetchOnWindowFocus: false,
-                    refetchOnReconnect: true,
-                    refetchOnMount: false,
-                    staleTime: Infinity,
-                    retry: false
+        if (!sharedQueryClientInstance) {
+            sharedQueryClientInstance = new _reactquery.QueryClient({
+                defaultOptions: {
+                    queries: {
+                        useErrorBoundary: false,
+                        refetchOnWindowFocus: false,
+                        refetchOnReconnect: true,
+                        refetchOnMount: false,
+                        staleTime: Infinity,
+                        retry: false
+                    }
                 }
-            }
-        });
+            });
+        }
+        return sharedQueryClientInstance;
     }, [
         client,
         hostClient
     ]);
 }
 function useQuery(queryKey, queryFn, options) {
-    if (!useRQ) {
-        throw new Error('@tanstack/react-query is required to use useQuery. Please install it as a dependency: npm install @tanstack/react-query');
-    }
-    return useRQ(queryKey, queryFn, {
+    return (0, _reactquery.useQuery)(queryKey, queryFn, {
         ...options,
         context: clientContext
     });

package/dist/cjs/react-query.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    SharedQueryClientProvider: function() {
+        return _queryClient.SharedQueryClientProvider;
+    },
+    useQuery: function() {
+        return _queryClient.useQuery;
+    },
+    useQueryClient: function() {
+        return _queryClient.useQueryClient;
+    }
+});
+const _queryClient = require("./queryClient");
+_export_star(require("./hooks/useContentTypes"), exports);
+function _export_star(from, to) {
+    Object.keys(from).forEach(function(k) {
+        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+            Object.defineProperty(to, k, {
+                enumerable: true,
+                get: function() {
+                    return from[k];
+                }
+            });
+        }
+    });
+    return from;
+}

package/dist/esm/hooks/useContentTypes.js

@@ -22,10 +22,13 @@ export function useContentTypes(source) {
     const queryClient = useQueryClient();
     const spaceId = 'ids' in source ? source.ids.space : '';
     const environmentId = 'ids' in source ? source.ids.environmentAlias ?? source.ids.environment : '';
-    const queryParams = useMemo(()=>({
+    const queryKey = useMemo(()=>createGetManyContentTypesKey(spaceId, environmentId, {
             limit: 1000
-        }), []);
-    const { data: contentTypes = [] } = useQuery(createGetManyContentTypesKey(spaceId, environmentId, queryParams), async ()=>{
+        }), [
+        spaceId,
+        environmentId
+    ]);
+    const { data: contentTypes = [] } = useQuery(queryKey, async ()=>{
         const allContentTypes = [];
         const limit = 1000;
         let skip = 0;
@@ -52,19 +55,17 @@ export function useContentTypes(source) {
         }
         const unsubscribe = navigator.onSlideInNavigation(({ oldSlideLevel, newSlideLevel })=>{
             if (oldSlideLevel > newSlideLevel) {
-                void queryClient.invalidateQueries(createGetManyContentTypesKey(spaceId, environmentId, queryParams));
+                void queryClient.invalidateQueries(queryKey);
             }
         });
         return unsubscribe;
     }, [
         navigator,
         queryClient,
-        spaceId,
-        environmentId,
-        queryParams
+        queryKey
     ]);
     const invalidate = ()=>{
-        return queryClient.invalidateQueries(createGetManyContentTypesKey(spaceId, environmentId, queryParams));
+        return queryClient.invalidateQueries(queryKey);
     };
     return {
         contentTypes,

package/dist/esm/index.js

@@ -12,11 +12,9 @@ export * from './types';
 export * from './hooks/useActiveLocales';
 export * from './hooks/useReleaseStatus';
 export * from './hooks/useLocalePublishStatus';
-export * from './hooks/useContentTypes';
 export * from './LocalePublishingEntityStatusBadge';
 export * from './ReleaseEntityStatusBadge';
 export * from './utils/determineReleaseAction';
 export * from './utils/getEntityReleaseStatus';
 export * from './utils/getReleaseStatusBadgeConfig';
-export { SharedQueryClientProvider, useQueryClient, useQuery } from './queryClient';
 export * from './queryKeys';

package/dist/esm/queryClient.js

@@ -1,14 +1,7 @@
 import * as React from 'react';
-let RQQueryClient;
-let useRQ;
-let useHostQueryClient = ()=>undefined;
-try {
-    const rq = require('@tanstack/react-query');
-    RQQueryClient = rq.QueryClient;
-    useRQ = rq.useQuery;
-    useHostQueryClient = rq.useQueryClient;
-} catch  {}
+import { QueryClient, useQuery as useRQ, useQueryClient as useHostQueryClient } from '@tanstack/react-query';
 const clientContext = /*#__PURE__*/ React.createContext(undefined);
+let sharedQueryClientInstance;
 function useMaybeHostQueryClient() {
     try {
         return useHostQueryClient();
@@ -24,30 +17,27 @@ export function useQueryClient() {
             return client;
         }
         if (hostClient) return hostClient;
-        if (!RQQueryClient) {
-            throw new Error('@tanstack/react-query is required to use QueryClient. Please install it as a dependency: npm install @tanstack/react-query');
-        }
-        return new RQQueryClient({
-            defaultOptions: {
-                queries: {
-                    useErrorBoundary: false,
-                    refetchOnWindowFocus: false,
-                    refetchOnReconnect: true,
-                    refetchOnMount: false,
-                    staleTime: Infinity,
-                    retry: false
+        if (!sharedQueryClientInstance) {
+            sharedQueryClientInstance = new QueryClient({
+                defaultOptions: {
+                    queries: {
+                        useErrorBoundary: false,
+                        refetchOnWindowFocus: false,
+                        refetchOnReconnect: true,
+                        refetchOnMount: false,
+                        staleTime: Infinity,
+                        retry: false
+                    }
                 }
-            }
-        });
+            });
+        }
+        return sharedQueryClientInstance;
     }, [
         client,
         hostClient
     ]);
 }
 export function useQuery(queryKey, queryFn, options) {
-    if (!useRQ) {
-        throw new Error('@tanstack/react-query is required to use useQuery. Please install it as a dependency: npm install @tanstack/react-query');
-    }
     return useRQ(queryKey, queryFn, {
         ...options,
         context: clientContext

package/dist/esm/react-query.js

@@ -0,0 +1,2 @@
+export { SharedQueryClientProvider, useQueryClient, useQuery } from './queryClient';
+export * from './hooks/useContentTypes';

package/dist/types/index.d.ts

@@ -14,11 +14,9 @@ export * from './types';
 export * from './hooks/useActiveLocales';
 export * from './hooks/useReleaseStatus';
 export * from './hooks/useLocalePublishStatus';
-export * from './hooks/useContentTypes';
 export * from './LocalePublishingEntityStatusBadge';
 export * from './ReleaseEntityStatusBadge';
 export * from './utils/determineReleaseAction';
 export * from './utils/getEntityReleaseStatus';
 export * from './utils/getReleaseStatusBadgeConfig';
-export { SharedQueryClientProvider, useQueryClient, useQuery } from './queryClient';
 export * from './queryKeys';

package/dist/types/queryClient.d.ts

@@ -1,10 +1,13 @@
 import * as React from 'react';
-import type { QueryClient, UseQueryOptions, UseQueryResult, QueryKey, QueryFunction } from '@tanstack/react-query';
+import { QueryClient, type UseQueryOptions, type UseQueryResult, type QueryKey, type QueryFunction } from '@tanstack/react-query';
 export declare function useQueryClient(): QueryClient;
 export declare function useQuery<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(queryKey: TQueryKey, queryFn: QueryFunction<TQueryFnData, TQueryKey>, options?: Omit<UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'queryKey' | 'queryFn'>): UseQueryResult<TData, TError>;
 /**
  * Provides access to a query client either by sharing an existing client or
  * creating a new one.
+ *
+ * @param client - Optional QueryClient instance. When provided (e.g., in tests),
+ *                 it takes priority over any host client or singleton.
  */
 export declare function SharedQueryClientProvider({ children, client: providedClient, }: React.PropsWithChildren<{
     client?: QueryClient;

package/dist/types/queryKeys.d.ts

@@ -1,14 +1,10 @@
 /**
- * Query key factories matching user_interface repository structure.
+ * Query key factories for React Query cache management.
  *
- * IMPORTANT: These must stay in sync with user_interface to enable cache sharing.
- * When updating, check the corresponding file in user_interface repository.
+ * These factories provide consistent query keys across the application.
  */
 /**
  * Creates a query key for fetching a single entry.
- * Matches the structure used in user_interface for cache sharing.
- *
- * Source: https://github.com/contentful/user_interface/blob/main/src/javascripts/core/react-query/cma/entry/useGetEntry.ts
  *
  * @param spaceId - The space ID
  * @param environmentId - The environment ID
@@ -18,9 +14,6 @@
 export declare const createGetEntryKey: (spaceId: string, environmentId: string, entryId: string) => string[];
 /**
  * Creates a query key for fetching a single asset.
- * Matches the structure used in user_interface for cache sharing.
- *
- * Source: https://github.com/contentful/user_interface/blob/main/src/javascripts/core/react-query/cma/asset/useGetAsset.ts
  *
  * @param spaceId - The space ID
  * @param environmentId - The environment ID
@@ -30,9 +23,6 @@ export declare const createGetEntryKey: (spaceId: string, environmentId: string,
 export declare const createGetAssetKey: (spaceId: string, environmentId: string, assetId: string) => string[];
 /**
  * Creates a query key for fetching a single space.
- * Matches the structure used in user_interface for cache sharing.
- *
- * Source: https://github.com/contentful/user_interface/blob/main/src/javascripts/core/react-query/cma/space/useGetSpace.ts
  *
  * @param spaceId - The space ID to fetch
  * @returns Query key array for React Query
@@ -40,9 +30,6 @@ export declare const createGetAssetKey: (spaceId: string, environmentId: string,
 export declare const createGetSpaceKey: (spaceId: string) => string[];
 /**
  * Creates a query key for fetching multiple locales.
- * Matches the structure used in user_interface for cache sharing.
- *
- * Source: https://github.com/contentful/user_interface/blob/main/src/javascripts/core/react-query/cma/locale/useGetManyLocales.ts
  *
  * @param spaceId - The space ID
  * @param environmentId - The environment ID
@@ -52,9 +39,6 @@ export declare const createGetSpaceKey: (spaceId: string) => string[];
 export declare const createGetManyLocalesKey: (spaceId: string, environmentId: string, params?: Record<string, unknown>) => (string | Record<string, unknown>)[];
 /**
  * Creates a query key for fetching a single content type.
- * Matches the structure used in user_interface for cache sharing.
- *
- * Source: https://github.com/contentful/user_interface/blob/main/src/javascripts/core/react-query/cma/contentType/useGetContentType.ts
  *
  * @param spaceId - The space ID
  * @param environmentId - The environment ID
@@ -64,9 +48,6 @@ export declare const createGetManyLocalesKey: (spaceId: string, environmentId: s
 export declare const createGetContentTypeKey: (spaceId: string, environmentId: string, contentTypeId: string) => string[];
 /**
  * Creates a query key for fetching multiple content types.
- * Matches the structure used in user_interface for cache sharing.
- *
- * Source: https://github.com/contentful/user_interface/blob/main/src/javascripts/core/react-query/cma/contentType/useGetManyContentTypes.ts
  *
  * @param spaceId - The space ID
  * @param environmentId - The environment ID

package/dist/types/react-query.d.ts

@@ -0,0 +1,2 @@
+export { SharedQueryClientProvider, useQueryClient, useQuery } from './queryClient';
+export * from './hooks/useContentTypes';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-shared",
-  "version": "2.17.1-canary.59+54b401aa",
+  "version": "2.17.2-canary.1+168bff6f",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -11,6 +11,12 @@
       "import": "./dist/esm/index.js",
       "default": "./dist/cjs/index.js"
     },
+    "./react-query": {
+      "types": "./dist/types/react-query.d.ts",
+      "require": "./dist/cjs/react-query.js",
+      "import": "./dist/esm/react-query.js",
+      "default": "./dist/cjs/react-query.js"
+    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -37,7 +43,7 @@
   },
   "devDependencies": {
     "@contentful/app-sdk": "^4.42.0",
-    "@contentful/field-editor-test-utils": "^1.7.0",
+    "@contentful/field-editor-test-utils": "^1.7.1-canary.76+168bff6f",
     "@lingui/core": "5.3.0",
     "@tanstack/react-query": "^4.3.9",
     "@testing-library/react": "16.3.0"
@@ -67,5 +73,5 @@
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/"
   },
-  "gitHead": "54b401aa9908c8380c3801bf25fa38e23dff72d2"
+  "gitHead": "168bff6f172e483def0432b3095e8f0a2af37b1f"
 }