@thoughtbot/superglue 2.0.0-alpha.1 → 2.0.0-alpha.3

package/dist/cjs/superglue.cjs

@@ -5526,6 +5526,7 @@ __export(lib_exports, {
   getIn: () => getIn,
   pageReducer: () => pageReducer,
   prepareStore: () => prepareStore,
+  receiveResponse: () => receiveResponse,
   removePage: () => removePage,
   rootReducer: () => rootReducer,
   saveAndProcessPage: () => saveAndProcessPage,
@@ -6024,6 +6025,18 @@ var saveFragment = (0, import_toolkit.createAction)(
     };
   }
 );
+var receiveResponse = (0, import_toolkit.createAction)(
+  "@@superglue/RECEIVE_RESPONSE",
+  ({ pageKey, response }) => {
+    pageKey = urlToPageKey(pageKey);
+    return {
+      payload: {
+        pageKey,
+        response
+      }
+    };
+  }
+);
 var appendToFragment = (0, import_toolkit.createAction)(
   "@@superglue/APPEND_TO_FRAGMENT",
   ({ data, fragmentId }) => {
@@ -6120,6 +6133,7 @@ the same page. Or if you're sure you want to proceed, use force: true.
           throw new MismatchedComponentError(message);
         }
       }
+      dispatch(receiveResponse({ pageKey, response: json }));
       const page = beforeSave(pages[pageKey], json);
       return dispatch(saveAndProcessPage(pageKey, page)).then(() => meta);
     }).catch((e) => handleFetchErr(e, fetchArgs, dispatch));
@@ -6286,95 +6300,6 @@ var handleStreamResponse = (response) => {
   };
 };
 
-// lib/action_creators/index.ts
-function fetchDeferments(pageKey, defers = []) {
-  pageKey = urlToPageKey(pageKey);
-  return (dispatch) => {
-    const fetches = defers.filter(({ type }) => type === "auto").map(function({
-      url,
-      successAction = GRAFTING_SUCCESS,
-      failAction = GRAFTING_ERROR
-    }) {
-      const keyPath = propsAtParam(url);
-      return dispatch(remote(url, { pageKey })).then(() => {
-        dispatch({
-          type: successAction,
-          payload: {
-            pageKey,
-            keyPath
-          }
-        });
-      }).catch((err) => {
-        dispatch({
-          type: failAction,
-          payload: {
-            url,
-            err,
-            pageKey,
-            keyPath
-          }
-        });
-      });
-    });
-    return Promise.all(fetches);
-  };
-}
-function saveAndProcessPage(pageKey, page) {
-  return (dispatch) => {
-    pageKey = urlToPageKey(pageKey);
-    let nextPage = page;
-    page.fragments.reverse().forEach((fragment) => {
-      const { id, path } = fragment;
-      const node = getIn(nextPage, path);
-      nextPage = setIn(page, path, { __id: id });
-      dispatch(
-        saveFragment({
-          fragmentId: id,
-          data: node
-        })
-      );
-    });
-    if (nextPage.action === "graft") {
-      if (typeof nextPage.fragmentContext === "string") {
-        dispatch(
-          handleFragmentGraft({
-            fragmentId: nextPage.fragmentContext,
-            response: nextPage
-          })
-        );
-      } else {
-        dispatch(handleGraft({ pageKey, page: nextPage }));
-      }
-    } else if (nextPage.action === "handleStreamResponse") {
-      dispatch(handleStreamResponse(nextPage));
-      return Promise.resolve();
-    } else {
-      dispatch(saveResponse({ pageKey, page: nextPage }));
-    }
-    const hasFetch = typeof fetch != "undefined";
-    if (hasFetch) {
-      return dispatch(fetchDeferments(pageKey, nextPage.defers)).then(
-        () => Promise.resolve()
-      );
-    } else {
-      return Promise.resolve();
-    }
-  };
-}
-
-// lib/index.tsx
-var import_react_redux5 = require("react-redux");
-
-// lib/hooks/useStreamSource.tsx
-var import_react2 = require("react");
-
-// lib/hooks/index.ts
-var import_react_redux3 = require("react-redux");
-
-// lib/hooks/useContent.tsx
-var import_react_redux = require("react-redux");
-var import_react = require("react");
-
 // lib/utils/proxy.ts
 var ORIGINAL_TARGET = Symbol("@@originalTarget");
 var ARRAY_GETTER_METHODS = /* @__PURE__ */ new Set([
@@ -6579,7 +6504,117 @@ function unproxy(proxy) {
   return proxy;
 }
 
+// lib/action_creators/index.ts
+function fetchDeferments(pageKey, defers = []) {
+  pageKey = urlToPageKey(pageKey);
+  return (dispatch) => {
+    const fetches = defers.filter(({ type }) => type === "auto").map(function({
+      url,
+      successAction = GRAFTING_SUCCESS,
+      failAction = GRAFTING_ERROR
+    }) {
+      const keyPath = propsAtParam(url);
+      return dispatch(remote(url, { pageKey })).then(() => {
+        dispatch({
+          type: successAction,
+          payload: {
+            pageKey,
+            keyPath
+          }
+        });
+      }).catch((err) => {
+        dispatch({
+          type: failAction,
+          payload: {
+            url,
+            err,
+            pageKey,
+            keyPath
+          }
+        });
+      });
+    });
+    return Promise.all(fetches);
+  };
+}
+function addPlaceholdersToDeferredNodes(existingPage, page) {
+  const { defers = [] } = existingPage;
+  const prevDefers = defers.map(({ path }) => {
+    const node = getIn(existingPage, path);
+    const copy = JSON.stringify(node);
+    return [path, JSON.parse(copy)];
+  });
+  return prevDefers.reduce((memo, [path, node]) => {
+    return setIn(page, path, node);
+  }, page);
+}
+function saveAndProcessPage(pageKey, page) {
+  return (dispatch, getState) => {
+    pageKey = urlToPageKey(pageKey);
+    let nextPage = page;
+    const state = getState();
+    if (page.action === "savePage" && state.pages[pageKey]) {
+      const existingPage = createProxy(
+        state.pages[pageKey],
+        { current: state.fragments },
+        /* @__PURE__ */ new Set(),
+        /* @__PURE__ */ new WeakMap()
+      );
+      nextPage = JSON.parse(
+        JSON.stringify(addPlaceholdersToDeferredNodes(existingPage, nextPage))
+      );
+    }
+    page.fragments.reverse().forEach((fragment) => {
+      const { id, path } = fragment;
+      const node = getIn(nextPage, path);
+      nextPage = setIn(page, path, { __id: id });
+      dispatch(
+        saveFragment({
+          fragmentId: id,
+          data: node
+        })
+      );
+    });
+    if (nextPage.action === "graft") {
+      if (typeof nextPage.fragmentContext === "string") {
+        dispatch(
+          handleFragmentGraft({
+            fragmentId: nextPage.fragmentContext,
+            response: nextPage
+          })
+        );
+      } else {
+        dispatch(handleGraft({ pageKey, page: nextPage }));
+      }
+    } else if (nextPage.action === "handleStreamResponse") {
+      dispatch(handleStreamResponse(nextPage));
+      return Promise.resolve();
+    } else {
+      dispatch(saveResponse({ pageKey, page: nextPage }));
+    }
+    const hasFetch = typeof fetch != "undefined";
+    if (hasFetch) {
+      return dispatch(fetchDeferments(pageKey, nextPage.defers)).then(
+        () => Promise.resolve()
+      );
+    } else {
+      return Promise.resolve();
+    }
+  };
+}
+
+// lib/index.tsx
+var import_react_redux5 = require("react-redux");
+
+// lib/hooks/useStreamSource.tsx
+var import_react2 = require("react");
+
+// lib/hooks/index.ts
+var import_react_redux3 = require("react-redux");
+
 // lib/hooks/useContent.tsx
+var import_react_redux = require("react-redux");
+var import_react = require("react");
 function useContent(fragmentRef, options) {
   const superglueState = useSuperglue();
   const currentPageKey = superglueState.currentPageKey;
@@ -6797,7 +6832,6 @@ var NavigationProvider = (0, import_react3.forwardRef)(function NavigationProvid
             hash: location.hash
           },
           {
-            pageKey: nextPageKey,
             superglue: true,
             posY: window.pageYOffset,
             posX: window.pageXOffset
@@ -6806,7 +6840,7 @@ var NavigationProvider = (0, import_react3.forwardRef)(function NavigationProvid
       }
     }
     if (state && "superglue" in state) {
-      const { pageKey } = state;
+      const pageKey = urlToPageKey(location.pathname + location.search);
       const prevPageKey = store.getState().superglue.currentPageKey;
       const containsKey = !!pages[pageKey];
       if (containsKey) {
@@ -6855,7 +6889,6 @@ var NavigationProvider = (0, import_react3.forwardRef)(function NavigationProvid
       const historyArgs = [
         path,
         {
-          pageKey: nextPageKey,
           superglue: true,
           posY: 0,
           posX: 0
@@ -6914,17 +6947,6 @@ var NavigationProvider = (0, import_react3.forwardRef)(function NavigationProvid
 });
 
 // lib/reducers/index.ts
-function addPlaceholdersToDeferredNodes(existingPage, page) {
-  const { defers = [] } = existingPage;
-  const prevDefers = defers.map(({ path }) => {
-    const node = getIn(existingPage, path);
-    const copy = JSON.stringify(node);
-    return [path, JSON.parse(copy)];
-  });
-  return prevDefers.reduce((memo, [path, node]) => {
-    return setIn(page, path, node);
-  }, page);
-}
 function constrainPagesSize(state) {
   const { maxPages } = config;
   const allPageKeys = Object.keys(state);
@@ -6937,14 +6959,10 @@ function constrainPagesSize(state) {
 }
 function handleSaveResponse(state, pageKey, page) {
   state = { ...state };
-  let nextPage = {
+  const nextPage = {
     ...page,
     savedAt: Date.now()
   };
-  const existingPage = state[pageKey];
-  if (existingPage) {
-    nextPage = addPlaceholdersToDeferredNodes(existingPage, nextPage);
-  }
   constrainPagesSize(state);
   state[pageKey] = nextPage;
   return state;
@@ -7139,6 +7157,9 @@ var prepareStore = (store, initialPage, path) => {
       pageKey: initialPageKey
     })
   );
+  store.dispatch(
+    receiveResponse({ pageKey: initialPageKey, response: initialPage })
+  );
   store.dispatch(saveAndProcessPage(initialPageKey, initialPage));
   store.dispatch(setCSRFToken({ csrfToken }));
 };
@@ -7221,6 +7242,7 @@ function Application({
   getIn,
   pageReducer,
   prepareStore,
+  receiveResponse,
   removePage,
   rootReducer,
   saveAndProcessPage,