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

package/dist/{index-MyfFLe4E.d.mts → index-O_srQ3Nm.d.mts}

@@ -145,6 +145,7 @@ type StreamResponse = {
     csrfToken?: string;
     action: 'handleStreamResponse';
     renderedAt: number;
+    slices: JSONObject;
 };
 type PageResponse = GraftResponse | SaveResponse | StreamResponse;
 type FragmentRef = {
@@ -268,4 +269,4 @@ declare const visit: VisitCreator;
 
 declare function saveAndProcessPage(pageKey: string, page: PageResponse): SaveAndProcessPageThunk;
 
-export { type Visit as $, type ApplicationRemote as A, type VisitCreator as B, type ComponentIdentifier as C, type Defer as D, type RemoteCreator as E, type FetchArgs as F, type GraftResponse as G, type Handlers as H, type Dispatch as I, type JSONMappable as J, type Keypath as K, type UJSHandlers as L, type Meta as M, type NavigationContextProps as N, type HistoryState as O, type PageKey as P, type SaveAndProcessPageThunk as Q, type RestoreStrategy as R, type SuperglueStore as S, type MetaThunk as T, type Unproxied as U, type VisitMeta as V, type VisitMetaThunk as W, type DefermentThunk as X, type BasicRequestInit as Y, type BuildStore as Z, type BuildVisitAndRemote as _, type JSONValue as a, type VisitProps as a0, type Remote as a1, type RemoteProps as a2, type BeforeSave as a3, type GraftingSuccessAction as a4, type GraftingErrorAction as a5, MismatchedComponentError as a6, remote as a7, visit as a8, type NavigationProviderProps as b, type NavigateTo as c, type SaveResponse as d, type SuperglueState as e, type SetupProps as f, type ApplicationVisit as g, type ApplicationProps as h, superglueReducer as i, type NavigationAction as j, type JSONPrimitive as k, type JSONObject as l, type JSONKeyable as m, type Fragment as n, type ParsedResponse as o, pageReducer as p, type Page as q, rootReducer as r, saveAndProcessPage as s, type StreamMutateMessage as t, type StreamResponse as u, type PageResponse as v, type FragmentRef as w, type AllPages as x, type AllFragments as y, type RootState as z };
+export { type Visit as $, type ApplicationRemote as A, type VisitCreator as B, type ComponentIdentifier as C, type Defer as D, type RemoteCreator as E, type FetchArgs as F, type GraftResponse as G, type Handlers as H, type Dispatch as I, type JSONMappable as J, type Keypath as K, type UJSHandlers as L, type Meta as M, type NavigationContextProps as N, type HistoryState as O, type PageKey as P, type SaveAndProcessPageThunk as Q, type RestoreStrategy as R, type SuperglueStore as S, type MetaThunk as T, type Unproxied as U, type VisitMeta as V, type VisitMetaThunk as W, type DefermentThunk as X, type BasicRequestInit as Y, type BuildStore as Z, type BuildVisitAndRemote as _, type JSONValue as a, type VisitProps as a0, type Remote as a1, type RemoteProps as a2, type BeforeSave as a3, type GraftingSuccessAction as a4, type GraftingErrorAction as a5, MismatchedComponentError as a6, remote as a7, visit as a8, type NavigationProviderProps as b, type NavigateTo as c, type SaveResponse as d, type PageResponse as e, type SuperglueState as f, type SetupProps as g, type ApplicationVisit as h, type ApplicationProps as i, superglueReducer as j, type NavigationAction as k, type JSONPrimitive as l, type JSONObject as m, type JSONKeyable as n, type Fragment as o, pageReducer as p, type ParsedResponse as q, rootReducer as r, saveAndProcessPage as s, type Page as t, type StreamMutateMessage as u, type StreamResponse as v, type FragmentRef as w, type AllPages as x, type AllFragments as y, type RootState as z };

package/dist/superglue.d.mts

@@ -1,6 +1,6 @@
 import * as history from 'history';
-import { J as JSONMappable, K as Keypath, a as JSONValue, P as PageKey, A as ApplicationRemote, S as SuperglueStore, N as NavigationContextProps, b as NavigationProviderProps, c as NavigateTo, d as SaveResponse, F as FetchArgs, U as Unproxied, e as SuperglueState, f as SetupProps, g as ApplicationVisit, H as Handlers, h as ApplicationProps } from './index-MyfFLe4E.mjs';
-export { y as AllFragments, x as AllPages, Y as BasicRequestInit, a3 as BeforeSave, Z as BuildStore, _ as BuildVisitAndRemote, C as ComponentIdentifier, D as Defer, X as DefermentThunk, I as Dispatch, n as Fragment, w as FragmentRef, G as GraftResponse, a5 as GraftingErrorAction, a4 as GraftingSuccessAction, O as HistoryState, m as JSONKeyable, l as JSONObject, k as JSONPrimitive, M as Meta, T as MetaThunk, j as NavigationAction, q as Page, v as PageResponse, o as ParsedResponse, a1 as Remote, E as RemoteCreator, a2 as RemoteProps, R as RestoreStrategy, z as RootState, Q as SaveAndProcessPageThunk, t as StreamMutateMessage, u as StreamResponse, L as UJSHandlers, $ as Visit, B as VisitCreator, V as VisitMeta, W as VisitMetaThunk, a0 as VisitProps, p as pageReducer, r as rootReducer, s as saveAndProcessPage, i as superglueReducer } from './index-MyfFLe4E.mjs';
+import { J as JSONMappable, K as Keypath, a as JSONValue, P as PageKey, A as ApplicationRemote, S as SuperglueStore, N as NavigationContextProps, b as NavigationProviderProps, c as NavigateTo, d as SaveResponse, F as FetchArgs, e as PageResponse, U as Unproxied, f as SuperglueState, g as SetupProps, h as ApplicationVisit, H as Handlers, i as ApplicationProps } from './index-O_srQ3Nm.mjs';
+export { y as AllFragments, x as AllPages, Y as BasicRequestInit, a3 as BeforeSave, Z as BuildStore, _ as BuildVisitAndRemote, C as ComponentIdentifier, D as Defer, X as DefermentThunk, I as Dispatch, o as Fragment, w as FragmentRef, G as GraftResponse, a5 as GraftingErrorAction, a4 as GraftingSuccessAction, O as HistoryState, n as JSONKeyable, m as JSONObject, l as JSONPrimitive, M as Meta, T as MetaThunk, k as NavigationAction, t as Page, q as ParsedResponse, a1 as Remote, E as RemoteCreator, a2 as RemoteProps, R as RestoreStrategy, z as RootState, Q as SaveAndProcessPageThunk, u as StreamMutateMessage, v as StreamResponse, L as UJSHandlers, $ as Visit, B as VisitCreator, V as VisitMeta, W as VisitMetaThunk, a0 as VisitProps, p as pageReducer, r as rootReducer, s as saveAndProcessPage, j as superglueReducer } from './index-O_srQ3Nm.mjs';
 import React from 'react';
 import { Subscription, Consumer, ChannelNameWithParams } from '@rails/actioncable';
 import { DebouncedFunc } from 'lodash';
@@ -66,6 +66,13 @@ declare const beforeRemote: _reduxjs_toolkit.ActionCreatorWithPayload<{
     currentPageKey: PageKey;
     fetchArgs: FetchArgs;
 }, string>;
+declare const receiveResponse: _reduxjs_toolkit.ActionCreatorWithPreparedPayload<[{
+    pageKey: string;
+    response: PageResponse;
+}], {
+    pageKey: string;
+    response: PageResponse;
+}, "@@superglue/RECEIVE_RESPONSE", never, never>;
 
 type ProxiedContent<T> = T & {
     readonly [K in keyof T]: T[K] extends {
@@ -102,4 +109,4 @@ declare const setup: ({ initialPage, baseUrl, path, store, buildVisitAndRemote,
 };
 declare function Application({ initialPage, baseUrl, path, store, buildVisitAndRemote, history, mapping, ...rest }: ApplicationProps): React.JSX.Element;
 
-export { Application, ApplicationProps, ApplicationRemote, ApplicationVisit, FetchArgs, GRAFTING_ERROR, GRAFTING_SUCCESS, Handlers, JSONMappable, JSONValue, Keypath, NavigateTo, NavigationContext, NavigationContextProps, NavigationProvider, NavigationProviderProps, PageKey, SaveResponse, SetupProps, SuperglueState, SuperglueStore, Unproxied, beforeFetch, beforeRemote, beforeVisit, copyPage, getIn, prepareStore, removePage, saveResponse, setup, unproxy, urlToPageKey, useContent, useSetFragment, useStreamSource, useSuperglue };
+export { Application, ApplicationProps, ApplicationRemote, ApplicationVisit, FetchArgs, GRAFTING_ERROR, GRAFTING_SUCCESS, Handlers, JSONMappable, JSONValue, Keypath, NavigateTo, NavigationContext, NavigationContextProps, NavigationProvider, NavigationProviderProps, PageKey, PageResponse, SaveResponse, SetupProps, SuperglueState, SuperglueStore, Unproxied, beforeFetch, beforeRemote, beforeVisit, copyPage, getIn, prepareStore, receiveResponse, removePage, saveResponse, setup, unproxy, urlToPageKey, useContent, useSetFragment, useStreamSource, useSuperglue };

package/dist/superglue.mjs

@@ -10,6 +10,7 @@ import {
   beforeVisit,
   config,
   copyPage,
+  createProxy,
   getIn,
   handleFragmentGraft,
   handleGraft,
@@ -18,6 +19,7 @@ import {
   lastRequestIds,
   parsePageKey,
   prependToFragment,
+  receiveResponse,
   removePage,
   saveAndProcessPage,
   saveFragment,
@@ -29,8 +31,9 @@ import {
   streamPrepend,
   streamSave,
   ujsHandlers,
+  unproxy,
   urlToPageKey
-} from "./chunk-YS477OKK.mjs";
+} from "./chunk-EU2SLL5L.mjs";
 
 // node_modules/lodash/lodash.js
 var require_lodash = __commonJS({
@@ -740,7 +743,7 @@ var require_lodash = __commonJS({
         var reIsNative = RegExp2(
           "^" + funcToString.call(hasOwnProperty).replace(reRegExpChar, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$"
         );
-        var Buffer = moduleExports ? context.Buffer : undefined2, Symbol2 = context.Symbol, Uint8Array = context.Uint8Array, allocUnsafe = Buffer ? Buffer.allocUnsafe : undefined2, getPrototype = overArg(Object2.getPrototypeOf, Object2), objectCreate = Object2.create, propertyIsEnumerable = objectProto.propertyIsEnumerable, splice = arrayProto.splice, spreadableSymbol = Symbol2 ? Symbol2.isConcatSpreadable : undefined2, symIterator = Symbol2 ? Symbol2.iterator : undefined2, symToStringTag = Symbol2 ? Symbol2.toStringTag : undefined2;
+        var Buffer = moduleExports ? context.Buffer : undefined2, Symbol = context.Symbol, Uint8Array = context.Uint8Array, allocUnsafe = Buffer ? Buffer.allocUnsafe : undefined2, getPrototype = overArg(Object2.getPrototypeOf, Object2), objectCreate = Object2.create, propertyIsEnumerable = objectProto.propertyIsEnumerable, splice = arrayProto.splice, spreadableSymbol = Symbol ? Symbol.isConcatSpreadable : undefined2, symIterator = Symbol ? Symbol.iterator : undefined2, symToStringTag = Symbol ? Symbol.toStringTag : undefined2;
         var defineProperty = function() {
           try {
             var func = getNative(Object2, "defineProperty");
@@ -755,7 +758,7 @@ var require_lodash = __commonJS({
         var metaMap = WeakMap2 && new WeakMap2();
         var realNames = {};
         var dataViewCtorString = toSource(DataView), mapCtorString = toSource(Map), promiseCtorString = toSource(Promise2), setCtorString = toSource(Set2), weakMapCtorString = toSource(WeakMap2);
-        var symbolProto = Symbol2 ? Symbol2.prototype : undefined2, symbolValueOf = symbolProto ? symbolProto.valueOf : undefined2, symbolToString = symbolProto ? symbolProto.toString : undefined2;
+        var symbolProto = Symbol ? Symbol.prototype : undefined2, symbolValueOf = symbolProto ? symbolProto.valueOf : undefined2, symbolToString = symbolProto ? symbolProto.toString : undefined2;
         function lodash(value) {
           if (isObjectLike(value) && !isArray(value) && !(value instanceof LazyWrapper)) {
             if (value instanceof LodashWrapper) {
@@ -5526,212 +5529,6 @@ import { useSelector as useSelector3 } from "react-redux";
 // lib/hooks/useContent.tsx
 import { useSelector } from "react-redux";
 import { useMemo, useRef } from "react";
-
-// lib/utils/proxy.ts
-var ORIGINAL_TARGET = Symbol("@@originalTarget");
-var ARRAY_GETTER_METHODS = /* @__PURE__ */ new Set([
-  Symbol.iterator,
-  "at",
-  "concat",
-  "entries",
-  "every",
-  "filter",
-  "find",
-  "findIndex",
-  "flat",
-  "flatMap",
-  "forEach",
-  "includes",
-  "indexOf",
-  "join",
-  "keys",
-  "lastIndexOf",
-  "map",
-  "reduce",
-  "reduceRight",
-  "slice",
-  "some",
-  "toString",
-  "values"
-]);
-var ARRAY_SETTER_METHODS = /* @__PURE__ */ new Set([
-  "copyWithin",
-  "fill",
-  "pop",
-  "push",
-  "reverse",
-  "shift",
-  "sort",
-  "splice",
-  "unshift"
-]);
-function isArraySetter(prop) {
-  return ARRAY_SETTER_METHODS.has(prop);
-}
-function isArrayGetter(prop) {
-  return ARRAY_GETTER_METHODS.has(prop);
-}
-function convertToInt(prop) {
-  if (typeof prop === "symbol") return null;
-  const num = Number(prop);
-  return Number.isInteger(num) ? num : null;
-}
-function isFragmentReference(value) {
-  return !!value && typeof value === "object" && "__id" in value && typeof value.__id === "string";
-}
-function createArrayProxy(arrayData, fragments, dependencies, proxyCache) {
-  if (proxyCache && proxyCache.has(arrayData)) {
-    return proxyCache.get(arrayData);
-  }
-  const proxy = new Proxy(arrayData, {
-    get(target, prop) {
-      if (prop === ORIGINAL_TARGET) {
-        return target;
-      }
-      if (isArrayGetter(prop)) {
-        const method = target[prop];
-        if (typeof method === "function") {
-          return function(...args) {
-            return Reflect.apply(method, proxy, args);
-          };
-        }
-        return method;
-      }
-      if (isArraySetter(prop)) {
-        throw new Error(
-          `Cannot mutate proxy array. Use Redux actions to update state.`
-        );
-      }
-      const index = convertToInt(prop);
-      if (index !== null && index >= 0 && index < target.length) {
-        const item = target[index];
-        if (isFragmentReference(item)) {
-          dependencies.add(item.__id);
-          const fragmentData = fragments.current[item.__id];
-          if (!fragmentData) {
-            throw new Error(`Fragment with id "${item.__id}" not found`);
-          }
-          return createProxy(fragmentData, fragments, dependencies, proxyCache);
-        }
-        if (typeof item === "object" && item !== null) {
-          if ("$$typeof" in item) {
-            return item;
-          } else {
-            return createProxy(
-              item,
-              fragments,
-              dependencies,
-              proxyCache
-            );
-          }
-        }
-        return item;
-      }
-      return Reflect.get(target, prop);
-    },
-    has(target, prop) {
-      if (prop === ORIGINAL_TARGET) {
-        return true;
-      }
-      return Reflect.has(target, prop);
-    },
-    set() {
-      throw new Error(
-        "Cannot mutate proxy array. Use Redux actions to update state."
-      );
-    },
-    deleteProperty() {
-      throw new Error(
-        "Cannot delete properties on proxy array. Use Redux actions to update state."
-      );
-    },
-    defineProperty() {
-      throw new Error(
-        "Cannot define properties on proxy array. Use Redux actions to update state."
-      );
-    }
-  });
-  if (proxyCache) {
-    proxyCache.set(arrayData, proxy);
-  }
-  return proxy;
-}
-function createObjectProxy(objectData, fragments, dependencies, proxyCache) {
-  if (proxyCache && proxyCache.has(objectData)) {
-    return proxyCache.get(objectData);
-  }
-  const proxy = new Proxy(objectData, {
-    get(target, prop) {
-      if (prop === ORIGINAL_TARGET) {
-        return target;
-      }
-      const value = target[prop];
-      if (isFragmentReference(value)) {
-        dependencies.add(value.__id);
-        const fragmentData = fragments.current[value.__id];
-        if (!fragmentData) {
-          throw new Error(`Fragment with id "${value.__id}" not found`);
-        }
-        return createProxy(fragmentData, fragments, dependencies, proxyCache);
-      }
-      if (typeof value === "object" && value !== null) {
-        if ("$$typeof" in value) {
-          return value;
-        } else if (Array.isArray(value)) {
-          return createArrayProxy(value, fragments, dependencies, proxyCache);
-        } else {
-          return createObjectProxy(value, fragments, dependencies, proxyCache);
-        }
-      }
-      return value;
-    },
-    has(target, prop) {
-      if (prop === ORIGINAL_TARGET) {
-        return true;
-      }
-      return Reflect.has(target, prop);
-    },
-    set() {
-      throw new Error(
-        "Cannot mutate proxy object. Use Redux actions to update state."
-      );
-    },
-    deleteProperty() {
-      throw new Error(
-        "Cannot delete properties on proxy object. Use Redux actions to update state."
-      );
-    },
-    defineProperty() {
-      throw new Error(
-        "Cannot define properties on proxy object. Use Redux actions to update state."
-      );
-    }
-  });
-  if (proxyCache) {
-    proxyCache.set(objectData, proxy);
-  }
-  return proxy;
-}
-function createProxy(content, fragments, dependencies, proxyCache) {
-  if (!content || typeof content !== "object") {
-    return content;
-  }
-  if ("$$typeof" in content) {
-    return content;
-  }
-  if (Array.isArray(content)) {
-    return createArrayProxy(content, fragments, dependencies, proxyCache);
-  }
-  return createObjectProxy(content, fragments, dependencies, proxyCache);
-}
-function unproxy(proxy) {
-  if (proxy && typeof proxy === "object" && ORIGINAL_TARGET in proxy) {
-    return proxy[ORIGINAL_TARGET];
-  }
-  return proxy;
-}
-
-// lib/hooks/useContent.tsx
 function useContent(fragmentRef, options) {
   const superglueState = useSuperglue();
   const currentPageKey = superglueState.currentPageKey;
@@ -5955,7 +5752,6 @@ var NavigationProvider = forwardRef(function NavigationProvider2({ history, visi
             hash: location.hash
           },
           {
-            pageKey: nextPageKey,
             superglue: true,
             posY: window.pageYOffset,
             posX: window.pageXOffset
@@ -5964,7 +5760,7 @@ var NavigationProvider = forwardRef(function NavigationProvider2({ history, visi
       }
     }
     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) {
@@ -6013,7 +5809,6 @@ var NavigationProvider = forwardRef(function NavigationProvider2({ history, visi
       const historyArgs = [
         path,
         {
-          pageKey: nextPageKey,
           superglue: true,
           posY: 0,
           posX: 0
@@ -6072,17 +5867,6 @@ var NavigationProvider = forwardRef(function NavigationProvider2({ history, visi
 });
 
 // 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);
@@ -6095,14 +5879,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;
@@ -6297,6 +6077,9 @@ var prepareStore = (store, initialPage, path) => {
       pageKey: initialPageKey
     })
   );
+  store.dispatch(
+    receiveResponse({ pageKey: initialPageKey, response: initialPage })
+  );
   store.dispatch(saveAndProcessPage(initialPageKey, initialPage));
   store.dispatch(setCSRFToken({ csrfToken }));
 };
@@ -6378,6 +6161,7 @@ export {
   getIn,
   pageReducer,
   prepareStore,
+  receiveResponse,
   removePage,
   rootReducer,
   saveAndProcessPage,