@khanacademy/wonder-blocks-data 2.3.0 → 2.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khanacademy/wonder-blocks-data",
-  "version": "2.3.0",
+  "version": "2.3.4",
   "design": "v1",
   "publishConfig": {
     "access": "public"
@@ -13,15 +13,16 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@khanacademy/wonder-blocks-core": "^3.1.3"
+    "@babel/runtime": "^7.16.3",
+    "@khanacademy/wonder-blocks-core": "^4.0.0"
   },
   "peerDependencies": {
-    "react": "^16.4.1"
+    "react": "16.14.0"
   },
   "devDependencies": {
-    "wb-dev-build-settings": "^0.0.4"
+    "wb-dev-build-settings": "^0.2.0"
   },
   "author": "",
   "license": "MIT",
-  "gitHead": "2ae31bd8985e2a6128298fb11d8ef0d26d341057"
+  "gitHead": "9ebea88533e702011165072f090a377e02fa3f0f"
 }

package/src/components/data.js

@@ -132,12 +132,10 @@ export default class Data<TOptions, TData: ValidData> extends React.Component<
                 {(value) => {
                     const handlerType = this.props.handler.type;
                     const interceptor = value[handlerType];
-                    const handler = this._getHandlerFromInterceptor(
-                        interceptor,
-                    );
-                    const getEntry = this._getCacheLookupFnFromInterceptor(
-                        interceptor,
-                    );
+                    const handler =
+                        this._getHandlerFromInterceptor(interceptor);
+                    const getEntry =
+                        this._getCacheLookupFnFromInterceptor(interceptor);
 
                     /**
                      * Need to share our types with InternalData so Flow

package/src/components/intercept-context.js

@@ -8,8 +8,7 @@ import type {InterceptContextData} from "../util/types.js";
  *
  * INTERNAL USE ONLY
  */
-const InterceptContext: React.Context<InterceptContextData> = React.createContext<InterceptContextData>(
-    {},
-);
+const InterceptContext: React.Context<InterceptContextData> =
+    React.createContext<InterceptContextData>({});
 
 export default InterceptContext;

package/src/util/memory-cache.js

@@ -30,7 +30,8 @@ function deepClone<T: {...}>(source: T | $ReadOnly<T>): $ReadOnly<T> {
  * absence of a custom cache. We use this for SSR too (see ./response-cache.js).
  */
 export default class MemoryCache<TOptions, TData: ValidData>
-    implements ICache<TOptions, TData> {
+    implements ICache<TOptions, TData>
+{
     _cache: Cache;
 
     constructor(source: ?$ReadOnly<Cache> = null) {

package/src/util/no-cache.js

@@ -14,7 +14,8 @@ let defaultInstance: ?ICache<any, any> = null;
  * requested data after hydration has finished.
  */
 export default class NoCache<TOptions, TData: ValidData>
-    implements ICache<TOptions, TData> {
+    implements ICache<TOptions, TData>
+{
     static get Default(): ICache<TOptions, TData> {
         if (defaultInstance == null) {
             defaultInstance = new NoCache<TOptions, TData>();

package/src/util/request-handler.js

@@ -8,7 +8,8 @@ import type {ValidData, CacheEntry, IRequestHandler, ICache} from "./types.js";
  * use with the Wonder Blocks Data framework.
  */
 export default class RequestHandler<TOptions, TData: ValidData>
-    implements IRequestHandler<TOptions, TData> {
+    implements IRequestHandler<TOptions, TData>
+{
     _type: string;
     _cache: ?ICache<TOptions, TData>;
     _hydrate: boolean;

package/src/util/request-tracking.js

@@ -25,9 +25,8 @@ type RequestCache = {
  *
  * INTERNAL USE ONLY
  */
-export const TrackerContext: React.Context<?TrackerFn> = new React.createContext<?TrackerFn>(
-    null,
-);
+export const TrackerContext: React.Context<?TrackerFn> =
+    new React.createContext<?TrackerFn>(null);
 
 /**
  * The default instance is stored here.

package/src/__tests__/index.test.js

@@ -1,147 +0,0 @@
-// @flow
-import {Server} from "@khanacademy/wonder-blocks-core";
-import {
-    initializeCache,
-    fulfillAllDataRequests,
-    hasUnfulfilledRequests,
-    removeFromCache,
-    removeAllFromCache,
-} from "../index.js";
-import {ResponseCache} from "../util/response-cache.js";
-import {RequestTracker} from "../util/request-tracking.js";
-
-import type {IRequestHandler, ResponseCache as Cache} from "../index.js";
-
-describe("@khanacademy/wonder-blocks-data", () => {
-    test("package exports what we expect", async () => {
-        // Arrange
-        const importedModule = import("../index.js");
-
-        // Act
-        const result = await importedModule;
-
-        // Assert
-        expect(Object.keys(result).sort()).toEqual(
-            [
-                "Data",
-                "InterceptCache",
-                "InterceptData",
-                "NoCache",
-                "RequestHandler",
-                "TrackData",
-                "hasUnfulfilledRequests",
-                "fulfillAllDataRequests",
-                "initializeCache",
-                "removeFromCache",
-                "removeAllFromCache",
-            ].sort(),
-        );
-    });
-
-    describe("#initializeCache", () => {
-        test("invokes ResponseCache.Default.initialize", () => {
-            // Arrange
-            const initializeSpy = jest.spyOn(
-                ResponseCache.Default,
-                "initialize",
-            );
-            const cache: Cache = ({}: any);
-
-            // Act
-            initializeCache(cache);
-
-            // Assert
-            expect(initializeSpy).toHaveBeenCalledWith(cache);
-        });
-    });
-
-    describe("#fulfillAllDataRequests", () => {
-        test("when server-side, invokes RequestTracker.Default.fulfillTrackedRequests", () => {
-            // Arrange
-            jest.spyOn(Server, "isServerSide").mockReturnValue(true);
-            const fulfillTrackedRequests = jest.spyOn(
-                RequestTracker.Default,
-                "fulfillTrackedRequests",
-            );
-
-            // Act
-            fulfillAllDataRequests();
-
-            // Assert
-            expect(fulfillTrackedRequests).toHaveBeenCalled();
-        });
-
-        test("when client-side, rejects with error", async () => {
-            // Arrange
-            jest.spyOn(Server, "isServerSide").mockReturnValue(false);
-
-            // Act
-            const underTest = fulfillAllDataRequests();
-
-            // Assert
-            await expect(underTest).rejects.toThrowErrorMatchingInlineSnapshot(
-                `"Data requests are not tracked when client-side"`,
-            );
-        });
-    });
-
-    describe("#hasUnfulfilledRequests", () => {
-        test("when server-side, invokes RequestTracker.Default.hasUnfulfilledRequests", () => {
-            // Arrange
-            jest.spyOn(Server, "isServerSide").mockReturnValue(true);
-            const hasUnfulfilledRequestsSpy = jest.spyOn(
-                RequestTracker.Default,
-                "hasUnfulfilledRequests",
-                "get",
-            );
-
-            // Act
-            hasUnfulfilledRequests();
-
-            // Assert
-            expect(hasUnfulfilledRequestsSpy).toHaveBeenCalled();
-        });
-
-        test("when client-side, rejects with error", () => {
-            // Arrange
-            jest.spyOn(Server, "isServerSide").mockReturnValue(false);
-
-            // Act
-            const underTest = () => hasUnfulfilledRequests();
-
-            // Assert
-            expect(underTest).toThrowErrorMatchingInlineSnapshot(
-                `"Data requests are not tracked when client-side"`,
-            );
-        });
-    });
-
-    describe("#removeFromCache", () => {
-        test("invokes ResponseCache.Default.remove", () => {
-            // Arrange
-            const removeSpy = jest.spyOn(ResponseCache.Default, "remove");
-            const fakeHandler: IRequestHandler<string, string> = ({}: any);
-
-            // Act
-            removeFromCache(fakeHandler, "REMOVE");
-
-            // Assert
-            expect(removeSpy).toHaveBeenCalledWith(fakeHandler, "REMOVE");
-        });
-    });
-
-    describe("#removeAllFromCache", () => {
-        test("invokes ResponseCache.Default.removeAll", () => {
-            // Arrange
-            const removeAllSpy = jest.spyOn(ResponseCache.Default, "removeAll");
-            const fakeHandler: IRequestHandler<string, string> = ({}: any);
-            const predicate = () => false;
-
-            // Act
-            removeAllFromCache(fakeHandler, predicate);
-
-            // Assert
-            expect(removeAllSpy).toHaveBeenCalledWith(fakeHandler, predicate);
-        });
-    });
-});