@contentful/field-editor-reference 6.19.0 → 6.19.2-alpha.0

package/dist/cjs/common/EntityStore.js

@@ -149,7 +149,7 @@ function handleResourceFetchError(resourceFetchError, resourceTypeEntity) {
     throw resourceFetchError;
 }
 const isEntityQueryKey = (queryKey)=>{
-    return Array.isArray(queryKey) && (queryKey[0] === 'Entry' || queryKey[0] === 'Asset') && queryKey.length === 4;
+    return Array.isArray(queryKey) && (queryKey[0] === 'Entry' || queryKey[0] === 'Asset') && (queryKey.length === 4 || queryKey.length === 5);
 };
 async function fetchContentfulEntry({ urn, fetch, options }) {
     const resourceId = urn.split(':', 6)[5];
@@ -470,10 +470,11 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = (0,
     const onSlideInNavigation = props.sdk.navigator.onSlideInNavigation;
     (0, _react.useEffect)(()=>{
         function findSameSpaceQueries() {
-            return queryCache.findAll({
+            const queries = queryCache.findAll({
                 type: 'active',
                 predicate: (query)=>isSameSpaceEntityQueryKey(query.queryKey)
             });
+            return queries;
         }
         if (typeof onEntityChanged !== 'function') {
             return onSlideInNavigation(({ oldSlideLevel, newSlideLevel })=>{
@@ -487,8 +488,11 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = (0,
         const subscribeQuery = ({ queryKey, queryHash })=>{
             const [entityType, entityId, , , releaseId] = queryKey;
             entityChangeUnsubscribers.current[queryHash] = onEntityChanged(entityType, entityId, (data)=>{
-                if ((0, _lodash.get)(data, 'sys.release.id') === releaseId) {
+                const dataReleaseId = (0, _lodash.get)(data, 'sys.release.id');
+                if (dataReleaseId === releaseId) {
                     queryClient.setQueryData(queryKey, data);
+                } else if (releaseId && !dataReleaseId) {
+                    void queryClient.invalidateQueries(queryKey);
                 }
             });
         };

package/dist/cjs/common/queryClient.js

@@ -10,100 +10,13 @@ function _export(target, all) {
 }
 _export(exports, {
     SharedQueryClientProvider: function() {
-        return SharedQueryClientProvider;
+        return _fieldeditorshared.SharedQueryClientProvider;
     },
     useQuery: function() {
-        return useQuery;
+        return _fieldeditorshared.useQuery;
     },
     useQueryClient: function() {
-        return useQueryClient;
+        return _fieldeditorshared.useQueryClient;
     }
 });
-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();
-    var cacheNodeInterop = new WeakMap();
-    return (_getRequireWildcardCache = function(nodeInterop) {
-        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-    })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
-    var newObj = {
-        __proto__: null
-    };
-    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for(var key in obj){
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
-            }
-        }
-    }
-    newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
-    return newObj;
-}
-const clientContext = /*#__PURE__*/ _react.createContext(undefined);
-function useMaybeHostQueryClient() {
-    try {
-        return (0, _reactquery.useQueryClient)();
-    } catch  {
-        return undefined;
-    }
-}
-function useQueryClient() {
-    const client = _react.useContext(clientContext);
-    const hostClient = useMaybeHostQueryClient();
-    return _react.useMemo(()=>{
-        if (client) {
-            return client;
-        }
-        if (hostClient) return hostClient;
-        return new _reactquery.QueryClient({
-            defaultOptions: {
-                queries: {
-                    useErrorBoundary: false,
-                    refetchOnWindowFocus: false,
-                    refetchOnReconnect: true,
-                    refetchOnMount: false,
-                    staleTime: Infinity,
-                    retry: false
-                }
-            }
-        });
-    }, [
-        client,
-        hostClient
-    ]);
-}
-const useQuery = (key, fn, opt)=>{
-    return (0, _reactquery.useQuery)(key, fn, {
-        ...opt,
-        context: clientContext
-    });
-};
-function SharedQueryClientProvider({ children }) {
-    const client = useQueryClient();
-    return /*#__PURE__*/ _react.createElement(clientContext.Provider, {
-        value: client
-    }, children);
-}
+const _fieldeditorshared = require("@contentful/field-editor-shared");

package/dist/esm/common/EntityStore.js

@@ -61,7 +61,7 @@ function handleResourceFetchError(resourceFetchError, resourceTypeEntity) {
     throw resourceFetchError;
 }
 const isEntityQueryKey = (queryKey)=>{
-    return Array.isArray(queryKey) && (queryKey[0] === 'Entry' || queryKey[0] === 'Asset') && queryKey.length === 4;
+    return Array.isArray(queryKey) && (queryKey[0] === 'Entry' || queryKey[0] === 'Asset') && (queryKey.length === 4 || queryKey.length === 5);
 };
 async function fetchContentfulEntry({ urn, fetch, options }) {
     const resourceId = urn.split(':', 6)[5];
@@ -382,10 +382,11 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = cons
     const onSlideInNavigation = props.sdk.navigator.onSlideInNavigation;
     useEffect(()=>{
         function findSameSpaceQueries() {
-            return queryCache.findAll({
+            const queries = queryCache.findAll({
                 type: 'active',
                 predicate: (query)=>isSameSpaceEntityQueryKey(query.queryKey)
             });
+            return queries;
         }
         if (typeof onEntityChanged !== 'function') {
             return onSlideInNavigation(({ oldSlideLevel, newSlideLevel })=>{
@@ -399,8 +400,11 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = cons
         const subscribeQuery = ({ queryKey, queryHash })=>{
             const [entityType, entityId, , , releaseId] = queryKey;
             entityChangeUnsubscribers.current[queryHash] = onEntityChanged(entityType, entityId, (data)=>{
-                if (get(data, 'sys.release.id') === releaseId) {
+                const dataReleaseId = get(data, 'sys.release.id');
+                if (dataReleaseId === releaseId) {
                     queryClient.setQueryData(queryKey, data);
+                } else if (releaseId && !dataReleaseId) {
+                    void queryClient.invalidateQueries(queryKey);
                 }
             });
         };

package/dist/esm/common/queryClient.js

@@ -1,47 +1 @@
-import * as React from 'react';
-import { QueryClient, useQuery as useRQ, useQueryClient as useHostQueryClient } from '@tanstack/react-query';
-const clientContext = /*#__PURE__*/ React.createContext(undefined);
-function useMaybeHostQueryClient() {
-    try {
-        return useHostQueryClient();
-    } catch  {
-        return undefined;
-    }
-}
-export function useQueryClient() {
-    const client = React.useContext(clientContext);
-    const hostClient = useMaybeHostQueryClient();
-    return React.useMemo(()=>{
-        if (client) {
-            return client;
-        }
-        if (hostClient) return hostClient;
-        return new QueryClient({
-            defaultOptions: {
-                queries: {
-                    useErrorBoundary: false,
-                    refetchOnWindowFocus: false,
-                    refetchOnReconnect: true,
-                    refetchOnMount: false,
-                    staleTime: Infinity,
-                    retry: false
-                }
-            }
-        });
-    }, [
-        client,
-        hostClient
-    ]);
-}
-export const useQuery = (key, fn, opt)=>{
-    return useRQ(key, fn, {
-        ...opt,
-        context: clientContext
-    });
-};
-export function SharedQueryClientProvider({ children }) {
-    const client = useQueryClient();
-    return /*#__PURE__*/ React.createElement(clientContext.Provider, {
-        value: client
-    }, children);
-}
+export { SharedQueryClientProvider, useQueryClient, useQuery } from '@contentful/field-editor-shared';

package/dist/types/common/EntityStore.d.ts

@@ -88,12 +88,12 @@ declare const useEntityLoader: () => {
 };
 export declare function useEntity<E extends FetchableEntity>(entityType: FetchableEntityType, entityId: string, options?: Omit<UseEntityOptions, 'releaseId'>): UseEntityResult<E>;
 export declare function useResource<R extends Resource = Resource>(resourceType: string, urn: string, { locale, referencingEntryId, ...options }?: UseResourceOptions): {
-    status: "error" | "success" | "loading";
+    status: "loading" | "error" | "success";
     data: ResourceInfo<R> | undefined;
     error: unknown;
 };
 export declare function useResourceProvider(organizationId: string, appDefinitionId: string): {
-    status: "error" | "success" | "loading";
+    status: "loading" | "error" | "success";
     data: ResourceProvider | undefined;
     error: unknown;
 };

package/dist/types/common/queryClient.d.ts

@@ -1,9 +1,5 @@
-import * as React from 'react';
-import { QueryClient, useQuery as useRQ } from '@tanstack/react-query';
-export declare function useQueryClient(): QueryClient;
-export declare const useQuery: typeof useRQ;
 /**
- * Provides access to a query client either by sharing an existing client or
- * creating a new one.
+ * Re-export query client utilities from shared package.
+ * This maintains backwards compatibility while using the shared implementation.
  */
-export declare function SharedQueryClientProvider({ children }: React.PropsWithChildren<{}>): React.JSX.Element;
+export { SharedQueryClientProvider, useQueryClient, useQuery, } from '@contentful/field-editor-shared';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-reference",
-  "version": "6.19.0",
+  "version": "6.19.2-alpha.0",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -39,7 +39,7 @@
     "@contentful/f36-components": "^5.8.1",
     "@contentful/f36-icons": "^5.8.1",
     "@contentful/f36-tokens": "^5.1.0",
-    "@contentful/field-editor-shared": "^2.17.0",
+    "@contentful/field-editor-shared": "^2.17.1-alpha.0",
     "@contentful/mimetype": "^2.2.29",
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/sortable": "^8.0.0",
@@ -68,5 +68,5 @@
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/"
   },
-  "gitHead": "67068016b57ce3057ddddfb8dd3a53ef86499a02"
+  "gitHead": "447875c5a2ef25eb4552c29b990d90ec40bc6985"
 }