@khanacademy/wonder-blocks-data 8.0.2 → 8.0.5

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @khanacademy/wonder-blocks-data
 
+## 8.0.5
+
+### Patch Changes
+
+-   08238b89: Export the `getGqlDataFromResponse` method so we can use it in custom `gqlFetch` scenarios for a consistent experience
+
+## 8.0.4
+
+### Patch Changes
+
+-   dc2e00f4: Do not fetch if FetchPolicy is CacheBeforeNetwork and there is already a cached value, even if the requestId changes
+
+## 8.0.3
+
+### Patch Changes
+
+-   5f4a4297: Make dependency on `flow-enums-runtime` explicit
+-   2b96fd59: Change flow-enums-runtime to be peer dependencies
+-   Updated dependencies [5f4a4297]
+-   Updated dependencies [2b96fd59]
+    -   @khanacademy/wonder-blocks-core@4.3.2
+
 ## 8.0.2
 
 ### Patch Changes

package/dist/es/index.js

@@ -585,7 +585,6 @@ const useCachedEffect = (requestId, handler, options = {}) => {
 
     return fetchFn;
   }, [requestId, onResultChanged, forceUpdate, setMostRecentResult, fetchPolicy]);
-  const requestIdRef = React.useRef(requestId);
   const shouldFetch = React.useMemo(() => {
     if (hardSkip) {
       return false;
@@ -596,14 +595,13 @@ const useCachedEffect = (requestId, handler, options = {}) => {
         return false;
 
       case FetchPolicy.CacheBeforeNetwork:
-        return mostRecentResult == null || requestId !== requestIdRef.current;
+        return mostRecentResult == null;
 
       case FetchPolicy.CacheAndNetwork:
       case FetchPolicy.NetworkOnly:
         return networkResultRef.current == null;
     }
-  }, [requestId, mostRecentResult, fetchPolicy, hardSkip]);
-  requestIdRef.current = requestId;
+  }, [mostRecentResult, fetchPolicy, hardSkip]);
   React.useEffect(() => {
     if (!shouldFetch) {
       return;
@@ -721,6 +719,71 @@ const getGqlRequestId = (operation, variables, context) => {
   return parts.join("|");
 };
 
+const GqlErrors = Object.freeze({
+  Internal: "Internal",
+  BadResponse: "BadResponse",
+  ErrorResult: "ErrorResult"
+});
+class GqlError extends KindError {
+  constructor(message, kind, {
+    metadata,
+    cause
+  } = {}) {
+    super(message, kind, {
+      metadata,
+      cause,
+      name: "Gql"
+    });
+  }
+
+}
+
+const getGqlDataFromResponse = async response => {
+  const bodyText = await response.text();
+  let result;
+
+  try {
+    result = JSON.parse(bodyText);
+  } catch (e) {
+    throw new DataError("Failed to parse response", DataErrors.Parse, {
+      metadata: {
+        statusCode: response.status,
+        bodyText
+      },
+      cause: e
+    });
+  }
+
+  if (response.status >= 300) {
+    throw new DataError("Response unsuccessful", DataErrors.Network, {
+      metadata: {
+        statusCode: response.status,
+        result
+      }
+    });
+  }
+
+  if (!Object.prototype.hasOwnProperty.call(result, "data") && !Object.prototype.hasOwnProperty.call(result, "errors")) {
+    throw new GqlError("Server response missing", GqlErrors.BadResponse, {
+      metadata: {
+        statusCode: response.status,
+        result
+      }
+    });
+  }
+
+  if (result.errors != null && Array.isArray(result.errors) && result.errors.length > 0) {
+    throw new GqlError("GraphQL errors", GqlErrors.ErrorResult, {
+      metadata: {
+        statusCode: response.status,
+        result
+      }
+    });
+  }
+
+  return result.data;
+};
+
 const DocumentTypes = Object.freeze({
   query: "query",
   mutation: "mutation"
@@ -825,25 +888,6 @@ const mergeGqlContext = (defaultContext, overrides) => {
   }, _extends({}, defaultContext));
 };
 
-const GqlErrors = Object.freeze({
-  Internal: "Internal",
-  BadResponse: "BadResponse",
-  ErrorResult: "ErrorResult"
-});
-class GqlError extends KindError {
-  constructor(message, kind, {
-    metadata,
-    cause
-  } = {}) {
-    super(message, kind, {
-      metadata,
-      cause,
-      name: "Gql"
-    });
-  }
-
-}
-
 const useGqlRouterContext = (contextOverrides = {}) => {
   const gqlRouterContext = useContext(GqlRouterContext);
 
@@ -873,52 +917,6 @@ const useGqlRouterContext = (contextOverrides = {}) => {
   return finalRouterContext;
 };
 
-const getGqlDataFromResponse = async response => {
-  const bodyText = await response.text();
-  let result;
-
-  try {
-    result = JSON.parse(bodyText);
-  } catch (e) {
-    throw new DataError("Failed to parse response", DataErrors.Parse, {
-      metadata: {
-        statusCode: response.status,
-        bodyText
-      },
-      cause: e
-    });
-  }
-
-  if (response.status >= 300) {
-    throw new DataError("Response unsuccessful", DataErrors.Network, {
-      metadata: {
-        statusCode: response.status,
-        result
-      }
-    });
-  }
-
-  if (!Object.prototype.hasOwnProperty.call(result, "data") && !Object.prototype.hasOwnProperty.call(result, "errors")) {
-    throw new GqlError("Server response missing", GqlErrors.BadResponse, {
-      metadata: {
-        statusCode: response.status,
-        result
-      }
-    });
-  }
-
-  if (result.errors != null && Array.isArray(result.errors) && result.errors.length > 0) {
-    throw new GqlError("GraphQL errors", GqlErrors.ErrorResult, {
-      metadata: {
-        statusCode: response.status,
-        result
-      }
-    });
-  }
-
-  return result.data;
-};
-
 const useGql = (context = {}) => {
   const gqlRouterContext = useGqlRouterContext(context);
   const gqlFetch = useCallback((operation, options = Object.freeze({})) => {
@@ -936,4 +934,4 @@ const useGql = (context = {}) => {
   return gqlFetch;
 };
 
-export { Data, DataError, DataErrors, FetchPolicy, GqlError, GqlErrors, GqlRouter, InterceptRequests, ScopedInMemoryCache, SerializableInMemoryCache, Status, TrackData, WhenClientSide, abortInflightRequests, fetchTrackedRequests, getGqlRequestId, graphQLDocumentNodeParser, hasTrackedRequestsToBeFetched, initializeHydrationCache, purgeCaches, purgeHydrationCache, purgeSharedCache, toGqlOperation, useCachedEffect, useGql, useHydratableEffect, useServerEffect, useSharedCache };
+export { Data, DataError, DataErrors, FetchPolicy, GqlError, GqlErrors, GqlRouter, InterceptRequests, ScopedInMemoryCache, SerializableInMemoryCache, Status, TrackData, WhenClientSide, abortInflightRequests, fetchTrackedRequests, getGqlDataFromResponse, getGqlRequestId, graphQLDocumentNodeParser, hasTrackedRequestsToBeFetched, initializeHydrationCache, purgeCaches, purgeHydrationCache, purgeSharedCache, toGqlOperation, useCachedEffect, useGql, useHydratableEffect, useServerEffect, useSharedCache };